From 632ad7cbfc530e64f05046ba75cd410fa2d3ad73 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Thu, 13 Aug 2020 16:11:39 +0000
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into
 release-1.19

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

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 64a4fd9..99c38f7 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -544,19 +544,19 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "fbbb12e99c8e"
+			"Rev": "964aaeff6c60"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "d2b2215ad471"
+			"Rev": "658236199ef9"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "16ae2a83e32a"
+			"Rev": "f28aff35751d"
 		},
 		{
 			"ImportPath": "k8s.io/component-base",
-			"Rev": "73a14f4c1c73"
+			"Rev": "044ed31edf51"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
@@ -568,7 +568,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi",
-			"Rev": "656914f816f9"
+			"Rev": "6aeccd4b50c6"
 		},
 		{
 			"ImportPath": "k8s.io/utils",
@@ -579,8 +579,8 @@
 			"Rev": "v0.2.0"
 		},
 		{
-			"ImportPath": "sigs.k8s.io/structured-merge-diff/v3",
-			"Rev": "43c19bbb7fba"
+			"ImportPath": "sigs.k8s.io/structured-merge-diff/v4",
+			"Rev": "v4.0.1"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/yaml",
diff --git a/go.mod b/go.mod
index c4add56..8e870ee 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-20200813171722-658236199ef9
+	k8s.io/component-base v0.0.0-20200813173350-044ed31edf51
 )
 
 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-20200813172118-964aaeff6c60
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200813171722-658236199ef9
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20200813172717-f28aff35751d
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20200813173350-044ed31edf51
 )
diff --git a/go.sum b/go.sum
index a321e1f..2d83650 100644
--- a/go.sum
+++ b/go.sum
@@ -355,6 +355,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-20200813172118-964aaeff6c60/go.mod h1:kxqZgwyrn3pjZ2td+6t9jG0Xut0Q06kxKM9OG8mFICo=
+k8s.io/apimachinery v0.0.0-20200813171722-658236199ef9/go.mod h1:1z+ESypfBDWAQXahXbqiOO581DaYTRgdaHAi60KXR1s=
+k8s.io/client-go v0.0.0-20200813172717-f28aff35751d/go.mod h1:bqG9Stej1Z/hV5hxJ5ZUE0TCc6UzM5DKeWoR3hvzUFw=
+k8s.io/component-base v0.0.0-20200813173350-044ed31edf51/go.mod h1:ti+moAAgHRlErGY7YCyANTu6RfOlfDNXGVov0wL5u7k=
 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=