From 3cbbb469b9f76274bc0de4f945e891bb5a192678 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Sun, 2 Aug 2020 12:40:02 +0000
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into
 release-1.19

Kubernetes-commit: 313e6e71a0631d58c7f9e710035df38855f2bcdb
---
 Godeps/Godeps.json |  8 ++++----
 go.mod             | 13 ++++++-------
 go.sum             |  4 ++++
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 596efe2..20b66ec 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -540,7 +540,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "83df1b82c014"
+			"Rev": "e83062b676e4"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
@@ -548,11 +548,11 @@
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "7f42acdcbb14"
+			"Rev": "470e5168e52f"
 		},
 		{
 			"ImportPath": "k8s.io/component-base",
-			"Rev": "83dc39ae1fb7"
+			"Rev": "5bf522bc4762"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
@@ -568,7 +568,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/utils",
-			"Rev": "0bdb4ca86cbc"
+			"Rev": "d5654de09c73"
 		},
 		{
 			"ImportPath": "rsc.io/binaryregexp",
diff --git a/go.mod b/go.mod
index c4add56..bb3ffe9 100644
--- a/go.mod
+++ b/go.mod
@@ -5,14 +5,13 @@ module k8s.io/kube-controller-manager
 go 1.15
 
 require (
-	k8s.io/apimachinery v0.0.0
-	k8s.io/component-base v0.0.0
+	k8s.io/apimachinery v0.0.0-20200727091313-7efdc26a675c
+	k8s.io/component-base v0.0.0-20200802133918-5bf522bc4762
 )
 
 replace (
-	k8s.io/api => ../api
-	k8s.io/apimachinery => ../apimachinery
-	k8s.io/client-go => ../client-go
-	k8s.io/component-base => ../component-base
-	k8s.io/kube-controller-manager => ../kube-controller-manager
+	k8s.io/api => k8s.io/api v0.0.0-20200731080027-e83062b676e4
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200727091313-7efdc26a675c
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20200802124002-470e5168e52f
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20200802133918-5bf522bc4762
 )
diff --git a/go.sum b/go.sum
index 3f7dbc8..510a9a6 100644
--- a/go.sum
+++ b/go.sum
@@ -354,6 +354,10 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 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=
+k8s.io/api v0.0.0-20200731080027-e83062b676e4/go.mod h1:6QwFoKNoXWMinlZZwHtDnpsr0l80pKtzo2w7kUsGqZE=
+k8s.io/apimachinery v0.0.0-20200727091313-7efdc26a675c/go.mod h1:oE8UQU9DqIIc9PyIEYxTj/oJECzZLymCEU9dL0H4F+o=
+k8s.io/client-go v0.0.0-20200802124002-470e5168e52f/go.mod h1:wyxcXldG//CRZ7WAgFmkssS+/7SMtrN2eJiHNTch6VQ=
+k8s.io/component-base v0.0.0-20200802133918-5bf522bc4762/go.mod h1:689zCF6HZQtHfkl/BdkrgrjIbSle8I+CnnCU0xNtug0=
 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.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=