From f28aff35751da231a46c73dce0dd179ff7f4f7c9 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 | 10 +++++-----
 go.mod             |  9 ++++-----
 go.sum             |  2 ++
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 2c5adedae..60453adad 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -444,11 +444,11 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "fbbb12e99c8e"
+			"Rev": "964aaeff6c60"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "d2b2215ad471"
+			"Rev": "658236199ef9"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
@@ -460,7 +460,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi",
-			"Rev": "656914f816f9"
+			"Rev": "6aeccd4b50c6"
 		},
 		{
 			"ImportPath": "k8s.io/utils",
@@ -471,8 +471,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 1959644ee..8ed29d610 100644
--- a/go.mod
+++ b/go.mod
@@ -26,15 +26,14 @@ require (
 	golang.org/x/net v0.0.0-20200707034311-ab3426394381
 	golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6
 	golang.org/x/time v0.0.0-20191024005414-555d28b269f0
-	k8s.io/api v0.0.0
-	k8s.io/apimachinery v0.0.0
+	k8s.io/api v0.0.0-20200813172118-964aaeff6c60
+	k8s.io/apimachinery v0.0.0-20200813171722-658236199ef9
 	k8s.io/klog/v2 v2.2.0
 	k8s.io/utils v0.0.0-20200729134348-d5654de09c73
 	sigs.k8s.io/yaml v1.2.0
 )
 
 replace (
-	k8s.io/api => ../api
-	k8s.io/apimachinery => ../apimachinery
-	k8s.io/client-go => ../client-go
+	k8s.io/api => k8s.io/api v0.0.0-20200813172118-964aaeff6c60
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200813171722-658236199ef9
 )
diff --git a/go.sum b/go.sum
index d591510b3..f280da501 100644
--- a/go.sum
+++ b/go.sum
@@ -335,6 +335,8 @@ 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/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=