From 9ba23720406bd574e61fa145f5492ce5282b6437 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Thu, 9 Jul 2020 00:05:50 -0700
Subject: [PATCH] Merge pull request #92611 from liggitt/go1.13

Tolerate go 1.13 builds

Kubernetes-commit: 896da2253c77d15fc551843e515039c6e9c86c99
---
 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 9ded5a0..c0da368 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -540,19 +540,19 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "70c9750ce4ed"
+			"Rev": "02047b7ecbbf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "8a773a02ba6b"
+			"Rev": "106aebdc1c0a"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "bdcd046d6cbf"
+			"Rev": "5ab99756f65d"
 		},
 		{
 			"ImportPath": "k8s.io/component-base",
-			"Rev": "df61fd08516e"
+			"Rev": "0307e6fabed6"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
diff --git a/go.mod b/go.mod
index c676dac..8bb29ae 100644
--- a/go.mod
+++ b/go.mod
@@ -5,14 +5,13 @@ module k8s.io/kube-controller-manager
 go 1.13
 
 require (
-	k8s.io/apimachinery v0.0.0
-	k8s.io/component-base v0.0.0
+	k8s.io/apimachinery v0.0.0-20200709130442-106aebdc1c0a
+	k8s.io/component-base v0.0.0-20200709132518-0307e6fabed6
 )
 
 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-20200709130931-02047b7ecbbf
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200709130442-106aebdc1c0a
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20200709131500-5ab99756f65d
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20200709132518-0307e6fabed6
 )
diff --git a/go.sum b/go.sum
index 9ab16f1..e853f64 100644
--- a/go.sum
+++ b/go.sum
@@ -352,6 +352,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-20200709130931-02047b7ecbbf/go.mod h1:lt1s4IKF4+kDlOlxxSmcNyf8j64o27uSvvnZ8BcI0FQ=
+k8s.io/apimachinery v0.0.0-20200709130442-106aebdc1c0a/go.mod h1:EjWiYOPi+BZennZ5pGa3JLkQ+znhEOodGy/+umjiLDU=
+k8s.io/client-go v0.0.0-20200709131500-5ab99756f65d/go.mod h1:FtCso/qJj5wuFWDAKCISjGDjJHrTHf7nwTkERLsat8k=
+k8s.io/component-base v0.0.0-20200709132518-0307e6fabed6/go.mod h1:lQ/9An+y9iOlhPTG5kYt9ZeucKAGeUudZClkA7Wanh4=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/klog/v2 v2.0.0 h1:Foj74zO6RbjjP4hBEKjnYtjjAhGg4jNynUdYF6fJrok=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=