From b06200931eeff1d85ea5451d68aac4729e44164b Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Thu, 20 Aug 2020 19:17:39 -0700
Subject: [PATCH] Merge pull request #94147 from liggitt/json-patch

Update json-patch to v4.9.0 tagged release

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

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index bcbeab85e..53f8912f0 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -184,7 +184,7 @@
 		},
 		{
 			"ImportPath": "github.com/evanphx/json-patch",
-			"Rev": "162e5629780b"
+			"Rev": "v4.9.0"
 		},
 		{
 			"ImportPath": "github.com/fatih/color",
@@ -330,10 +330,6 @@
 			"ImportPath": "github.com/inconshreveable/mousetrap",
 			"Rev": "v1.0.0"
 		},
-		{
-			"ImportPath": "github.com/jessevdk/go-flags",
-			"Rev": "v1.4.0"
-		},
 		{
 			"ImportPath": "github.com/jonboulle/clockwork",
 			"Rev": "v0.1.0"
@@ -672,19 +668,19 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "4934d0c67eba"
+			"Rev": "051d027c14e1"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "2c6e837afb20"
+			"Rev": "9254095ca5ca"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "e7a1d9ada0d5"
+			"Rev": "20923fd71b14"
 		},
 		{
 			"ImportPath": "k8s.io/component-base",
-			"Rev": "976a05f23b53"
+			"Rev": "1cf1c2dded48"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
diff --git a/go.mod b/go.mod
index 86947be49..5ceb6206b 100644
--- a/go.mod
+++ b/go.mod
@@ -41,10 +41,10 @@ require (
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 	gopkg.in/square/go-jose.v2 v2.2.2
 	gopkg.in/yaml.v2 v2.2.8
-	k8s.io/api v0.0.0
-	k8s.io/apimachinery v0.0.0
-	k8s.io/client-go v0.0.0
-	k8s.io/component-base v0.0.0
+	k8s.io/api v0.0.0-20200821051526-051d027c14e1
+	k8s.io/apimachinery v0.0.0-20200821051348-9254095ca5ca
+	k8s.io/client-go v0.0.0-20200821051752-20923fd71b14
+	k8s.io/component-base v0.0.0-20200821052257-1cf1c2dded48
 	k8s.io/klog/v2 v2.2.0
 	k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
 	k8s.io/utils v0.0.0-20200729134348-d5654de09c73
@@ -54,9 +54,8 @@ require (
 )
 
 replace (
-	k8s.io/api => ../api
-	k8s.io/apimachinery => ../apimachinery
-	k8s.io/apiserver => ../apiserver
-	k8s.io/client-go => ../client-go
-	k8s.io/component-base => ../component-base
+	k8s.io/api => k8s.io/api v0.0.0-20200821051526-051d027c14e1
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200821051348-9254095ca5ca
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20200821051752-20923fd71b14
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20200821052257-1cf1c2dded48
 )
diff --git a/go.sum b/go.sum
index 6a81d221c..ea614090e 100644
--- a/go.sum
+++ b/go.sum
@@ -507,6 +507,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-20200821051526-051d027c14e1/go.mod h1:6DKPkNII5GHfkmzU2WRXuDEJXvErpzTgkC/GRlsMFOQ=
+k8s.io/apimachinery v0.0.0-20200821051348-9254095ca5ca/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
+k8s.io/client-go v0.0.0-20200821051752-20923fd71b14/go.mod h1:kz7fk90GxOSGwCdAI1SPTNzsmAPPgh3Gr06lIP6G9mo=
+k8s.io/component-base v0.0.0-20200821052257-1cf1c2dded48/go.mod h1:1gG5qkov95cjSJQkbTCGYvuR7DSA+qOT2xW+oQp5MUQ=
 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=