From 03f765c56af031227f231adb14e92bc95fd65087 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Tue, 18 May 2021 08:35:32 -0700
Subject: [PATCH] Merge pull request #102094 from liggitt/revert-runc

Revert "Merge pull request #101888 from kolyshkin/update-runc-rc94"

Kubernetes-commit: 1295b2c4b59b8bba58186294eb2d76a7ecb4987e
---
 Godeps/Godeps.json | 8 ++++----
 go.mod             | 9 ++++-----
 go.sum             | 4 ++++
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index dc59cc42..15343cc8 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -192,7 +192,7 @@
 		},
 		{
 			"ImportPath": "github.com/google/go-cmp",
-			"Rev": "v0.5.4"
+			"Rev": "v0.5.2"
 		},
 		{
 			"ImportPath": "github.com/google/gofuzz",
@@ -400,7 +400,7 @@
 		},
 		{
 			"ImportPath": "golang.org/x/sys",
-			"Rev": "d19ff857e887"
+			"Rev": "a50acf3fe073"
 		},
 		{
 			"ImportPath": "golang.org/x/term",
@@ -476,11 +476,11 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "c10867da44cc"
+			"Rev": "bb4775a810cf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "e1b4d3faae10"
+			"Rev": "2540c63454fb"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
diff --git a/go.mod b/go.mod
index 3129d399..d532b62f 100644
--- a/go.mod
+++ b/go.mod
@@ -28,8 +28,8 @@ require (
 	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d
 	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
 	google.golang.org/protobuf v1.25.0
-	k8s.io/api v0.0.0
-	k8s.io/apimachinery v0.0.0
+	k8s.io/api v0.0.0-20210518191546-bb4775a810cf
+	k8s.io/apimachinery v0.0.0-20210518190924-2540c63454fb
 	k8s.io/klog/v2 v2.8.0
 	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
 	sigs.k8s.io/structured-merge-diff/v4 v4.1.1
@@ -37,7 +37,6 @@ require (
 )
 
 replace (
-	k8s.io/api => ../api
-	k8s.io/apimachinery => ../apimachinery
-	k8s.io/client-go => ../client-go
+	k8s.io/api => k8s.io/api v0.0.0-20210518191546-bb4775a810cf
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210518190924-2540c63454fb
 )
diff --git a/go.sum b/go.sum
index edc94778..9aef710b 100644
--- a/go.sum
+++ b/go.sum
@@ -426,6 +426,10 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+k8s.io/api v0.0.0-20210518191546-bb4775a810cf h1://fF+z+xmCAC5mLdeZZM/5nv5dfffNEvQmx3e725bqY=
+k8s.io/api v0.0.0-20210518191546-bb4775a810cf/go.mod h1:yBHRhVZ8UyTD3ouMqKUsGMI0W+g6+mDd6L2SrxTF8lQ=
+k8s.io/apimachinery v0.0.0-20210518190924-2540c63454fb h1:EZCUeWm5oj7bRkpo95xXigoMzDH8VfDi8tq7NN98Ozc=
+k8s.io/apimachinery v0.0.0-20210518190924-2540c63454fb/go.mod h1:fBRSkoylGO2QUTae8Wb2wac6pZ83/r+tL6HFSXGbzfs=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts=