From ffd8cfc5638d6855b9d82b2ba63fb86d5de2037d Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Fri, 21 May 2021 12:58:11 -0700
Subject: [PATCH] Merge pull request #102196 from
 kolyshkin/automated-cherry-pick-of-#102147-upstream-release-1.21

Automated cherry pick of #102147: vendor: bump runc to rc95

Kubernetes-commit: 133f66aa603c4624ff3544f26f54a153a54c6f94
---
 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 6ba4cc9a0..39900d3d6 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -196,7 +196,7 @@
 		},
 		{
 			"ImportPath": "github.com/google/go-cmp",
-			"Rev": "v0.5.2"
+			"Rev": "v0.5.4"
 		},
 		{
 			"ImportPath": "github.com/google/gofuzz",
@@ -400,7 +400,7 @@
 		},
 		{
 			"ImportPath": "golang.org/x/sys",
-			"Rev": "a50acf3fe073"
+			"Rev": "d19ff857e887"
 		},
 		{
 			"ImportPath": "golang.org/x/term",
@@ -476,11 +476,11 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "e379db4b881d"
+			"Rev": "b96220531b73"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "7559d788db3a"
+			"Rev": "1a7b32ce3b15"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
diff --git a/go.mod b/go.mod
index 26e51852e..1cafa6b3a 100644
--- a/go.mod
+++ b/go.mod
@@ -27,8 +27,8 @@ require (
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
 	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d
 	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
-	k8s.io/api v0.0.0
-	k8s.io/apimachinery v0.0.0
+	k8s.io/api v0.0.0-20210521231242-b96220531b73
+	k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15
 	k8s.io/klog/v2 v2.8.0
 	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
 	sigs.k8s.io/structured-merge-diff/v4 v4.1.0
@@ -36,7 +36,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-20210521231242-b96220531b73
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15
 )
diff --git a/go.sum b/go.sum
index 4b2f842cd..8acfa6f71 100644
--- a/go.sum
+++ b/go.sum
@@ -431,6 +431,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-20210521231242-b96220531b73 h1:PuJc9v6ozb0tuojUdhpMpMiLFLy/M8Mc/kwJMkd47no=
+k8s.io/api v0.0.0-20210521231242-b96220531b73/go.mod h1:90UO6Ryvwa9Yd0kKCHR1FoS1rzvfolT51aZuTitZqfM=
+k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15 h1:8KFyXEHJ9YhaFFEnFRPavjxc7gmLdhiBHAcvXM3ZGd4=
+k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15/go.mod h1:CdTY8fU/BlvAbJ2z/8kBwimGki5Zp8/fbVuLY8gJumM=
 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=