From c34a0c6aa29bcf9952383443f5750021bd811682 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Sat, 16 Nov 2019 16:13:30 +0000
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into
 release-1.17

Kubernetes-commit: 034eb142bf826a667ab01d95b5c09268273b58dd
---
 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 a562105..432f835 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -428,15 +428,15 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "f4e7d7f24368"
+			"Rev": "89d410bde4ec"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "a4c677cde034"
+			"Rev": "e7b5e74ed4e6"
 		},
 		{
 			"ImportPath": "k8s.io/component-base",
-			"Rev": "051688b905f7"
+			"Rev": "cf5856e80d06"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
@@ -452,7 +452,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/utils",
-			"Rev": "2b95a09bc58d"
+			"Rev": "e782cd3c129f"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff",
diff --git a/go.mod b/go.mod
index 48d2a29..03ffcde 100644
--- a/go.mod
+++ b/go.mod
@@ -5,16 +5,15 @@ module k8s.io/kube-controller-manager
 go 1.12
 
 require (
-	k8s.io/apimachinery v0.0.0
-	k8s.io/component-base v0.0.0
+	k8s.io/apimachinery v0.0.0-20191116161330-89d410bde4ec
+	k8s.io/component-base v0.0.0-20191116180848-cf5856e80d06
 )
 
 replace (
 	golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
 	golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
-	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-20191115142644-28bee1a9beb0
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191116161330-89d410bde4ec
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20191116161330-e7b5e74ed4e6
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20191116180848-cf5856e80d06
 )
diff --git a/go.sum b/go.sum
index a29776d..064985f 100644
--- a/go.sum
+++ b/go.sum
@@ -186,6 +186,10 @@ gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+k8s.io/api v0.0.0-20191115142644-28bee1a9beb0/go.mod h1:ZVjGUHSaVjiY2VSFKQpOMtCCSufZWU73UPNKtAURCBQ=
+k8s.io/apimachinery v0.0.0-20191116161330-89d410bde4ec/go.mod h1:dXFS2zaQR8fyzuvRdJDHw2Aerij/yVGJSre0bZQSVJA=
+k8s.io/client-go v0.0.0-20191116161330-e7b5e74ed4e6/go.mod h1:2oR1fke65nwa1i7ehLwbPB4jhz4+eC+mKRyq9b83E4U=
+k8s.io/component-base v0.0.0-20191116180848-cf5856e80d06/go.mod h1:bbUd/5sAsOqEe/rt84MT/4DMxjUSldYKPEQCoJ6XV8g=
 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=