From c247e1cf50f6edbf21d5b64f7f5abaa79f19fa13 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Wed, 12 Jun 2019 16:59:23 +0000
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into
 release-1.15

Kubernetes-commit: 6127bfb1bbd447e15fd839f3987abe1b8e5188b3
---
 Godeps/Godeps.json |  6 +++---
 go.mod             | 11 ++++++-----
 go.sum             |  2 ++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 0622cf2..1a7549c 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -168,15 +168,15 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "3d0b9da8819e"
+			"Rev": "1799e75a0719"
 		},
 		{
 			"ImportPath": "k8s.io/component-base",
-			"Rev": "c30aac650b93"
+			"Rev": "f40f68634749"
 		},
 		{
 			"ImportPath": "k8s.io/klog",
-			"Rev": "v0.3.2"
+			"Rev": "v0.3.1"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi",
diff --git a/go.mod b/go.mod
index 82ffa43..650fbce 100644
--- a/go.mod
+++ b/go.mod
@@ -5,15 +5,16 @@ 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-20190612205821-1799e75a0719
+	k8s.io/component-base v0.0.0-20190612210728-f40f68634749
 )
 
 replace (
 	golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
 	golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
 	golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
-	k8s.io/apimachinery => ../apimachinery
-	k8s.io/component-base => ../component-base
-	k8s.io/kube-controller-manager => ../kube-controller-manager
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20190612210728-f40f68634749
 )
+
+replace k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190612211130-07da2c5601ff
diff --git a/go.sum b/go.sum
index dd078ba..9392adb 100644
--- a/go.sum
+++ b/go.sum
@@ -56,6 +56,8 @@ gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod h1:I4A+glKBHiTgiEjQiCCQfCAIcIMFGt291SmsvcrFzJA=
+k8s.io/component-base v0.0.0-20190612210728-f40f68634749/go.mod h1:VLedAFwENz2swOjm0zmUXpAP2mV55c49xgaOzPBI/QQ=
 k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=
 k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=