From 2a282836017bf9a6d16c6bbc8ac3d4fdddc6a418 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Tue, 11 Aug 2020 19:19:45 -0700
Subject: [PATCH] Merge pull request #93811 from liggitt/json-patch-4.8.0-1.18

[1.18] Update to json-patch 4.8.0

Kubernetes-commit: 7914bac28a993d4493e0c1e31323bb9330dbdcf6
---
 Godeps/Godeps.json | 10 +++++++++-
 go.mod             |  1 -
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 70fca9f11..f44558aec 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -36,7 +36,7 @@
 		},
 		{
 			"ImportPath": "github.com/evanphx/json-patch",
-			"Rev": "v4.2.0"
+			"Rev": "162e5629780b"
 		},
 		{
 			"ImportPath": "github.com/fsnotify/fsnotify",
@@ -102,6 +102,10 @@
 			"ImportPath": "github.com/hpcloud/tail",
 			"Rev": "v1.0.0"
 		},
+		{
+			"ImportPath": "github.com/jessevdk/go-flags",
+			"Rev": "v1.4.0"
+		},
 		{
 			"ImportPath": "github.com/json-iterator/go",
 			"Rev": "v1.1.8"
@@ -154,6 +158,10 @@
 			"ImportPath": "github.com/onsi/gomega",
 			"Rev": "v1.7.0"
 		},
+		{
+			"ImportPath": "github.com/pkg/errors",
+			"Rev": "v0.8.1"
+		},
 		{
 			"ImportPath": "github.com/pmezard/go-difflib",
 			"Rev": "v1.0.0"
diff --git a/go.mod b/go.mod
index 108de3b65..70b4bc6fb 100644
--- a/go.mod
+++ b/go.mod
@@ -40,5 +40,4 @@ require (
 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/apimachinery => ../apimachinery
 )