From f90cc0fd4563135b2d8576eee557f0a39b3259aa Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Sat, 8 Aug 2020 12:48:19 -0700
Subject: [PATCH] Merge pull request #93810 from liggitt/json-patch-4.8.0

Update to json-patch 4.8.0

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

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 051c59b..deced5c 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -152,7 +152,7 @@
 		},
 		{
 			"ImportPath": "github.com/evanphx/json-patch",
-			"Rev": "e83c0a1c26c8"
+			"Rev": "162e5629780b"
 		},
 		{
 			"ImportPath": "github.com/fsnotify/fsnotify",
@@ -274,6 +274,10 @@
 			"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"
@@ -540,19 +544,19 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "4859c9473977"
+			"Rev": "a982eb560ae9"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "945d4ebf362b"
+			"Rev": "da970ee67a06"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "6ecbef177593"
+			"Rev": "9bbcfbab83f6"
 		},
 		{
 			"ImportPath": "k8s.io/component-base",
-			"Rev": "756196c2cad2"
+			"Rev": "840f05b81126"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
diff --git a/go.mod b/go.mod
index c4add56..0d27538 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-20200808211318-da970ee67a06
+	k8s.io/component-base v0.0.0-20200808212316-840f05b81126
 )
 
 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-20200808211507-a982eb560ae9
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200808211318-da970ee67a06
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20200808211739-9bbcfbab83f6
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20200808212316-840f05b81126
 )
diff --git a/go.sum b/go.sum
index 0ee7d15..87457a0 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-20200808211507-a982eb560ae9/go.mod h1:D0dJADuMCXgjxg4UaYG8TQtO9YT35ZcOfdyvLjv/oSc=
+k8s.io/apimachinery v0.0.0-20200808211318-da970ee67a06/go.mod h1:PDaNuc2kVa6eEsr0Zd3n7+UDnwWc2vQSKszKolx4i8M=
+k8s.io/client-go v0.0.0-20200808211739-9bbcfbab83f6/go.mod h1:K9apKx77d2ALpTCifIBUnUMy7wKDyQKWGiaX5MMeJOc=
+k8s.io/component-base v0.0.0-20200808212316-840f05b81126/go.mod h1:n8rw+YsWY+8i6Gu7I9KzSV/lrCY9HLlTPvnEg+Fb0tk=
 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=