From bc2968349019d2d525df0e0915921b64fdfdecd6 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Thu, 3 Sep 2020 04:12:11 -0700
Subject: [PATCH] Merge pull request #94149 from liggitt/json-patch-1.17

[1.17] Update to json-patch 4.9.0

Kubernetes-commit: 47cb66239b5622419406e41d46c1724ca2b66700
---
 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 4df3f827..36ab4b99 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -80,7 +80,7 @@
 		},
 		{
 			"ImportPath": "github.com/evanphx/json-patch",
-			"Rev": "162e5629780b"
+			"Rev": "v4.9.0"
 		},
 		{
 			"ImportPath": "github.com/fsnotify/fsnotify",
@@ -182,10 +182,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.8"
@@ -380,15 +376,15 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "eccf1e78d6cc"
+			"Rev": "f4b723619c71"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "0d585d148f6f"
+			"Rev": "e01b6f647e0d"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "b60a74718804"
+			"Rev": "59ba4f9bb573"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
diff --git a/go.mod b/go.mod
index f5594471..3fbe92bf 100644
--- a/go.mod
+++ b/go.mod
@@ -5,19 +5,18 @@ module k8s.io/sample-controller
 go 1.12
 
 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-20200903132056-f4b723619c71
+	k8s.io/apimachinery v0.0.0-20200903131703-e01b6f647e0d
+	k8s.io/client-go v0.0.0-20200903132615-59ba4f9bb573
+	k8s.io/code-generator v0.0.0-20200708122711-9380d7be9863
 	k8s.io/klog v1.0.0
 )
 
 replace (
 	golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
 	golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
-	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-20200903132056-f4b723619c71
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200903131703-e01b6f647e0d
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20200903132615-59ba4f9bb573
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200708122711-9380d7be9863
 )
diff --git a/go.sum b/go.sum
index 0284f5f9..c6906ce6 100644
--- a/go.sum
+++ b/go.sum
@@ -217,6 +217,10 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+k8s.io/api v0.0.0-20200903132056-f4b723619c71/go.mod h1:6jldM/f+1srnQ6exBO4L0duPFhjZA0QXAuxBg1nxJd0=
+k8s.io/apimachinery v0.0.0-20200903131703-e01b6f647e0d/go.mod h1:T54ZSpncArE25c5r2PbUPsLeTpkPWY/ivafigSX6+xk=
+k8s.io/client-go v0.0.0-20200903132615-59ba4f9bb573/go.mod h1:zmqBRHtnGLg/NrsyXD9+CvymNMgT3ZsRUX3hL9fYyNg=
+k8s.io/code-generator v0.0.0-20200708122711-9380d7be9863/go.mod h1:iiHz51+oTx+Z9D0vB3CH3O4HDDPWrvZyUgUYaIE9h9M=
 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk=
 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20190822140433-26a664648505 h1:ZY6yclUKVbZ+SdWnkfY+Je5vrMpKOxmGeKRbsXVmqYM=