From 23d090b2790f9afe40b713944e0d6d0fd59107b9 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Fri, 21 Aug 2020 15:45:54 +0000
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into
 release-1.19

Kubernetes-commit: 6acb6808a4ce366f66037811a4009d285db951f0
---
 Godeps/Godeps.json | 12 ++++--------
 go.mod             | 17 ++++++++---------
 go.sum             |  4 ++++
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 09051007..082f5040 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -128,7 +128,7 @@
 		},
 		{
 			"ImportPath": "github.com/evanphx/json-patch",
-			"Rev": "162e5629780b"
+			"Rev": "v4.9.0"
 		},
 		{
 			"ImportPath": "github.com/fsnotify/fsnotify",
@@ -238,10 +238,6 @@
 			"ImportPath": "github.com/imdario/mergo",
 			"Rev": "v0.3.5"
 		},
-		{
-			"ImportPath": "github.com/jessevdk/go-flags",
-			"Rev": "v1.4.0"
-		},
 		{
 			"ImportPath": "github.com/json-iterator/go",
 			"Rev": "v1.1.10"
@@ -448,15 +444,15 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "964aaeff6c60"
+			"Rev": "21b59c1ded36"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "658236199ef9"
+			"Rev": "b63a0c883fbf"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "f28aff35751d"
+			"Rev": "3e55cca68bbc"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
diff --git a/go.mod b/go.mod
index af42e0da..526d09db 100644
--- a/go.mod
+++ b/go.mod
@@ -5,17 +5,16 @@ module k8s.io/sample-controller
 go 1.15
 
 require (
-	k8s.io/api v0.0.0
-	k8s.io/apimachinery v0.0.0
-	k8s.io/client-go v0.0.0
-	k8s.io/code-generator v0.0.0
+	k8s.io/api v0.0.0-20200821172135-21b59c1ded36
+	k8s.io/apimachinery v0.0.0-20200821171749-b63a0c883fbf
+	k8s.io/client-go v0.0.0-20200821172742-3e55cca68bbc
+	k8s.io/code-generator v0.0.0-20200813171329-1c3794b15e35
 	k8s.io/klog/v2 v2.2.0
 )
 
 replace (
-	k8s.io/api => ../api
-	k8s.io/apimachinery => ../apimachinery
-	k8s.io/client-go => ../client-go
-	k8s.io/code-generator => ../code-generator
-	k8s.io/sample-controller => ../sample-controller
+	k8s.io/api => k8s.io/api v0.0.0-20200821172135-21b59c1ded36
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200821171749-b63a0c883fbf
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20200821172742-3e55cca68bbc
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200813171329-1c3794b15e35
 )
diff --git a/go.sum b/go.sum
index 3e6c142a..184672de 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-20200821172135-21b59c1ded36/go.mod h1:WXzrXjAr+IgCMGkIbOU4i87rvN7UWNGsyNmBEkW9rx8=
+k8s.io/apimachinery v0.0.0-20200821171749-b63a0c883fbf/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
+k8s.io/client-go v0.0.0-20200821172742-3e55cca68bbc/go.mod h1:SnLtmp6F+NMdYHYqnSKVWW81iA2wv5QfXXncW8aWuKc=
+k8s.io/code-generator v0.0.0-20200813171329-1c3794b15e35/go.mod h1:moqLn7w0t9cMs4+5CQyxnfA/HV8MF6aAVENF+WZZhgk=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14 h1:t4L10Qfx/p7ASH3gXCdIUtPbbIuegCoUJf3TMSFekjw=
 k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=