Merge pull request #94150 from liggitt/json-patch-1.16

[1.16] Update to json-patch 4.9.0 Kubernetes-commit: 35a8da66d5516aad90d1302396f06a83dc7f42c0
Update json-patch to v4.9.0 tagged release
2026-02-04 00:06:14 +08:00 · 2020-08-31 05:41:05 +00:00 · 2020-08-20 17:23:33 -04:00
3 changed files with 19 additions and 24 deletions
--- 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.7"
@@ -380,19 +376,19 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "v0.16.14"
+			"Rev": "f197499901bd"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "v0.16.14"
+			"Rev": "f7929272bda3"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "v0.16.14"
+			"Rev": "78b06b51d5b4"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
-			"Rev": "v0.16.14"
+			"Rev": "f5af5c5facff"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
--- a/go.mod
+++ b/go.mod
@@ -5,17 +5,17 @@ module k8s.io/sample-controller
 go 1.12

 require (
-	k8s.io/api v0.16.14
-	k8s.io/apimachinery v0.16.14
-	k8s.io/client-go v0.16.14
-	k8s.io/code-generator v0.16.14
+	k8s.io/api v0.0.0-20200831051839-f197499901bd
+	k8s.io/apimachinery v0.0.0-20200831051605-f7929272bda3
+	k8s.io/client-go v0.0.0-20200831052244-78b06b51d5b4
+	k8s.io/code-generator v0.0.0-20200429001146-f5af5c5facff
 	k8s.io/klog v1.0.0
 )

 replace (
 	golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7
-	k8s.io/api => k8s.io/api v0.16.14
-	k8s.io/apimachinery => k8s.io/apimachinery v0.16.14
-	k8s.io/client-go => k8s.io/client-go v0.16.14
-	k8s.io/code-generator => k8s.io/code-generator v0.16.14
+	k8s.io/api => k8s.io/api v0.0.0-20200831051839-f197499901bd
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200831051605-f7929272bda3
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20200831052244-78b06b51d5b4
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200429001146-f5af5c5facff
 )
--- a/go.sum
+++ b/go.sum
@@ -28,8 +28,8 @@ github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkg
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk=
 github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
-github.com/evanphx/json-patch v0.0.0-20200808040245-162e5629780b h1:vCplRbYcTTeBVLjIU0KvipEeVBSxl6sakUBRmeLBTkw=
-github.com/evanphx/json-patch v0.0.0-20200808040245-162e5629780b/go.mod h1:NAJj0yf/KaRKURN6nyi7A9IZydMivZEm9oQLWNjfKDc=
+github.com/evanphx/json-patch v4.9.0+incompatible h1:kLcOMZeuLAJvL2BPWLMIj5oaZQobrkAqrL+WFZwQses=
+github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -85,7 +85,6 @@ github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q=
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
-github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -225,10 +224,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.16.14/go.mod h1:9YN0cZ0g4SEwxmpr+E0PjXd5uc2gYaJR2bQU1GG6USs=
-k8s.io/apimachinery v0.16.14/go.mod h1:AS4lY4M1yKOeMWs98YuccQt7vwqO5ErTPxAXu1jewu0=
-k8s.io/client-go v0.16.14/go.mod h1:Sg+vCH8Wwd+UKgRp5TjzJ/O62v36V0xw/KCWyy+qSD4=
-k8s.io/code-generator v0.16.14/go.mod h1:J2H4yLa80/c3JcoMtjfRQ/cqZNWeJnNhrCtedYrPJ+k=
+k8s.io/api v0.0.0-20200831051839-f197499901bd/go.mod h1:RJgKC7GZjtg05LAZsVM4a8fWhl4Ikvy+3y+sl6Mom+Y=
+k8s.io/apimachinery v0.0.0-20200831051605-f7929272bda3/go.mod h1:xAtIC8Gj83Pn2OCs2g57wZpZembRhJhiXIlQIqanwas=
+k8s.io/client-go v0.0.0-20200831052244-78b06b51d5b4/go.mod h1:Jfrzv9Y4S7CNnDXAzM8nKXzikKIFycs5NMPL1r1RwIs=
+k8s.io/code-generator v0.0.0-20200429001146-f5af5c5facff/go.mod h1:J2H4yLa80/c3JcoMtjfRQ/cqZNWeJnNhrCtedYrPJ+k=
 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=
Author	SHA1	Message	Date
Kubernetes Publisher	bb59b6ba0f	Merge pull request #94150 from liggitt/json-patch-1.16 [1.16] Update to json-patch 4.9.0 Kubernetes-commit: 35a8da66d5516aad90d1302396f06a83dc7f42c0	2020-08-31 05:41:05 +00:00
Jordan Liggitt	c3e0c35bd3	Update json-patch to v4.9.0 tagged release Kubernetes-commit: a6668ce2512abde36627bf6004c1ccdd2c5897da	2020-08-20 17:23:33 -04:00