From 32a360b56168e2a06784cb422a294de77c0d2e45 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Thu, 20 May 2021 17:16:56 -0700
Subject: [PATCH] Merge pull request #102147 from
 kolyshkin/update-runc-rc94-take-II

vendor: bump runc to rc95

Kubernetes-commit: 5de1a754c8f875cacfa49b9c5ed63c6c35b7e9e5
---
 Godeps/Godeps.json | 18 +++++++++---------
 go.mod             | 21 ++++++++++-----------
 go.sum             | 12 ++++++++++++
 3 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index c2838f5..d6877fb 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -312,7 +312,7 @@
 		},
 		{
 			"ImportPath": "github.com/google/go-cmp",
-			"Rev": "v0.5.2"
+			"Rev": "v0.5.4"
 		},
 		{
 			"ImportPath": "github.com/google/gofuzz",
@@ -820,7 +820,7 @@
 		},
 		{
 			"ImportPath": "golang.org/x/sys",
-			"Rev": "a50acf3fe073"
+			"Rev": "d19ff857e887"
 		},
 		{
 			"ImportPath": "golang.org/x/term",
@@ -924,31 +924,31 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "d5fda5562a2e"
+			"Rev": "191e7be037d4"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "c7322e849168"
+			"Rev": "adc48d2d7eb5"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver",
-			"Rev": "954efc26d91c"
+			"Rev": "1f0a859e771e"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "b0c8a7cef141"
+			"Rev": "d1fa200aef5b"
 		},
 		{
 			"ImportPath": "k8s.io/cloud-provider",
-			"Rev": "c32ddfc84028"
+			"Rev": "ef721ff14ea5"
 		},
 		{
 			"ImportPath": "k8s.io/component-base",
-			"Rev": "8b08f85f6db5"
+			"Rev": "2a2fe9bbf92f"
 		},
 		{
 			"ImportPath": "k8s.io/controller-manager",
-			"Rev": "2fbf283059bb"
+			"Rev": "92a25ee50c87"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
diff --git a/go.mod b/go.mod
index 2405d3d..6fab20f 100644
--- a/go.mod
+++ b/go.mod
@@ -5,18 +5,17 @@ module k8s.io/kube-controller-manager
 go 1.16
 
 require (
-	k8s.io/apimachinery v0.0.0
-	k8s.io/cloud-provider v0.0.0
-	k8s.io/controller-manager v0.0.0
+	k8s.io/apimachinery v0.0.0-20210521070659-adc48d2d7eb5
+	k8s.io/cloud-provider v0.0.0-20210521074347-ef721ff14ea5
+	k8s.io/controller-manager v0.0.0-20210521074222-92a25ee50c87
 )
 
 replace (
-	k8s.io/api => ../api
-	k8s.io/apimachinery => ../apimachinery
-	k8s.io/apiserver => ../apiserver
-	k8s.io/client-go => ../client-go
-	k8s.io/cloud-provider => ../cloud-provider
-	k8s.io/component-base => ../component-base
-	k8s.io/controller-manager => ../controller-manager
-	k8s.io/kube-controller-manager => ../kube-controller-manager
+	k8s.io/api => k8s.io/api v0.0.0-20210521070909-191e7be037d4
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210521070659-adc48d2d7eb5
+	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210521072318-1f0a859e771e
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20210521071212-d1fa200aef5b
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210521074347-ef721ff14ea5
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20210521071829-2a2fe9bbf92f
+	k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210521074222-92a25ee50c87
 )
diff --git a/go.sum b/go.sum
index 8193333..ac153e2 100644
--- a/go.sum
+++ b/go.sum
@@ -608,6 +608,18 @@ 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-20210521070909-191e7be037d4 h1:qgCkzN01a1u8h5bYNgyqdKqGL+K19wvkp1JLOv3Oj2E=
+k8s.io/api v0.0.0-20210521070909-191e7be037d4/go.mod h1:GfPTpPBzvUagWJY1n2kt8oncShcczHwc4trHJ+04pNE=
+k8s.io/apimachinery v0.0.0-20210521070659-adc48d2d7eb5 h1:h4JFYCyQWf4U+jFWHXMZYkL9Drx9hLiBQbftQBMAfwU=
+k8s.io/apimachinery v0.0.0-20210521070659-adc48d2d7eb5/go.mod h1:8Ay3sPKuJtD/dIjPSlQVgJeuW/8JmLTCqDeAv6NSCxU=
+k8s.io/apiserver v0.0.0-20210521072318-1f0a859e771e/go.mod h1:M/0/gjd22HnYVS3g9fDOOMusA1lJUn4QYlwRPaRF0Vw=
+k8s.io/client-go v0.0.0-20210521071212-d1fa200aef5b/go.mod h1:fSZsfZrJMyBRs3783ddvdNtsZlZbJDL4O3F1ROhjdIY=
+k8s.io/cloud-provider v0.0.0-20210521074347-ef721ff14ea5 h1:kWPTYcFWnMLnVQSIWvIxxHDsUjgQqO94pTKTEeGQtkw=
+k8s.io/cloud-provider v0.0.0-20210521074347-ef721ff14ea5/go.mod h1:WrZRyDmH7698c7UzKqbj7Vol3u02oUCVF6dt3IVXIVU=
+k8s.io/component-base v0.0.0-20210521071829-2a2fe9bbf92f h1:5WGHsufGjyHFfwMXj0R/nilyN7HzOrb1XqGO6NErjDY=
+k8s.io/component-base v0.0.0-20210521071829-2a2fe9bbf92f/go.mod h1:PLrHIJKBKJZB+zZsUAAQNbGrps/afIih9Oj/oqdQtsc=
+k8s.io/controller-manager v0.0.0-20210521074222-92a25ee50c87 h1:SmxOQf1IzBlRWE+3VavzV7z001LLZjyA81EsmrCEAoU=
+k8s.io/controller-manager v0.0.0-20210521074222-92a25ee50c87/go.mod h1:Vz9hvDMO8qxrbQdSolqPReiIQGv6O7MFrEGpam7Q7UY=
 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=