Update dependencies to v0.17.14 tag

Merge pull request #94149 from liggitt/json-patch-1.17
[1.17] Update to json-patch 4.9.0 Kubernetes-commit: 47cb66239b5622419406e41d46c1724ca2b66700
2026-02-04 00:06:14 +08:00 · 2020-11-13 17:42:10 +00:00 · 2020-09-03 13:56:44 +00:00 · 2020-08-20 17:19:51 -04:00 · 2020-08-12 09:30:14 +00:00 · 2020-08-08 10:04:13 -04:00
3 changed files with 28 additions and 22 deletions
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -80,7 +80,7 @@
 		},
 		{
 			"ImportPath": "github.com/evanphx/json-patch",
-			"Rev": "v4.2.0"
+			"Rev": "v4.9.0"
 		},
 		{
 			"ImportPath": "github.com/fsnotify/fsnotify",
@@ -242,6 +242,10 @@
 			"ImportPath": "github.com/peterbourgon/diskv",
 			"Rev": "v2.0.1"
 		},
+		{
+			"ImportPath": "github.com/pkg/errors",
+			"Rev": "v0.8.1"
+		},
 		{
 			"ImportPath": "github.com/pmezard/go-difflib",
 			"Rev": "v1.0.0"
@@ -372,19 +376,19 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "2a93acf49b83"
+			"Rev": "v0.17.14"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "491fc9063aba"
+			"Rev": "v0.17.14"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "9ffc32955335"
+			"Rev": "v0.17.14"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
-			"Rev": "f15a378f7704"
+			"Rev": "v0.17.14"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
@@ -396,7 +400,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi",
-			"Rev": "82d701f24f9d"
+			"Rev": "bcb3869e6f29"
 		},
 		{
 			"ImportPath": "k8s.io/utils",
--- a/go.mod
+++ b/go.mod
@@ -5,18 +5,18 @@ module k8s.io/sample-controller
 go 1.12

 require (
-	k8s.io/api v0.0.0-20200404061942-2a93acf49b83
-	k8s.io/apimachinery v0.0.0-20200404061537-491fc9063aba
-	k8s.io/client-go v0.0.0-20200404062653-9ffc32955335
-	k8s.io/code-generator v0.0.0-20200404061114-f15a378f7704
+	k8s.io/api v0.17.14
+	k8s.io/apimachinery v0.17.14
+	k8s.io/client-go v0.17.14
+	k8s.io/code-generator v0.17.14
 	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 => k8s.io/api v0.0.0-20200404061942-2a93acf49b83
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200404061537-491fc9063aba
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20200404062653-9ffc32955335
-	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200404061114-f15a378f7704
+	k8s.io/api => k8s.io/api v0.17.14
+	k8s.io/apimachinery => k8s.io/apimachinery v0.17.14
+	k8s.io/client-go => k8s.io/client-go v0.17.14
+	k8s.io/code-generator => k8s.io/code-generator v0.17.14
 )
--- a/go.sum
+++ b/go.sum
@@ -27,8 +27,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 v4.2.0+incompatible h1:fUDGZCv/7iAN7u0puUVhvKCcsR6vRfwrJatElLBEf0I=
-github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+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=
@@ -121,6 +121,8 @@ github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGV
 github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
@@ -215,10 +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-20200404061942-2a93acf49b83/go.mod h1:9kJrdiqYr6QQVO1OhJlqhEFfJnC0bdfwa8VwazjeL+U=
-k8s.io/apimachinery v0.0.0-20200404061537-491fc9063aba/go.mod h1:ioIo1G/a+uONV7Tv+ZmCbMG1/a3kVw5YcDdncd8ugQ0=
-k8s.io/client-go v0.0.0-20200404062653-9ffc32955335/go.mod h1:UG7NBipoSMMuA1rcEV7pMkkhEGi9kKtvH7H2/ZHto2w=
-k8s.io/code-generator v0.0.0-20200404061114-f15a378f7704/go.mod h1:qdiSCSTKtS+3WtPelj2h57fylSQcPUlhMVm+TD9Dvqc=
+k8s.io/api v0.17.14/go.mod h1:pjv1T5ozRyCkLvZt6BJL92CZ6WZ1hmI6GcxlU0Oy+q4=
+k8s.io/apimachinery v0.17.14/go.mod h1:T54ZSpncArE25c5r2PbUPsLeTpkPWY/ivafigSX6+xk=
+k8s.io/client-go v0.17.14/go.mod h1:1SFRrpQKPcUNGwKy+M7IH+kAiMhw3DnkSth+XtWh5Tk=
+k8s.io/code-generator v0.17.14/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=
@@ -227,8 +229,8 @@ k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUc
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
 k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
-k8s.io/kube-openapi v0.0.0-20200316234421-82d701f24f9d h1:jocF7XFucw2pEiv2wS7wk2FRFCjDFGV1oa4TMs0SAT0=
-k8s.io/kube-openapi v0.0.0-20200316234421-82d701f24f9d/go.mod h1:F+5wygcW0wmRTnM3cOgIqGivxkwSWIWT5YdsDbeAOaU=
+k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29 h1:NeQXVJ2XFSkRoPzRo8AId01ZER+j8oV4SZADT4iBOXQ=
+k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29/go.mod h1:F+5wygcW0wmRTnM3cOgIqGivxkwSWIWT5YdsDbeAOaU=
 k8s.io/utils v0.0.0-20191114184206-e782cd3c129f h1:GiPwtSzdP43eI1hpPCbROQCCIgCuiMMNF8YUVLF3vJo=
 k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
 modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
Author	SHA1	Message	Date
Kubernetes Publisher	be2047bf86	Update dependencies to v0.17.14 tag	2020-11-13 17:42:10 +00:00
Kubernetes Publisher	bc29683490	Merge pull request #94149 from liggitt/json-patch-1.17 [1.17] Update to json-patch 4.9.0 Kubernetes-commit: 47cb66239b5622419406e41d46c1724ca2b66700	2020-09-03 13:56:44 +00:00
Jordan Liggitt	c32e4a3672	Update json-patch to v4.9.0 tagged release Kubernetes-commit: 474924381a99e45c3735800b19f41068affc9908	2020-08-20 17:19:51 -04:00
Kubernetes Publisher	c9d78d2a11	Merge pull request #93812 from liggitt/json-patch-4.8.0-1.17 [1.17] Update to json-patch 4.8.0 Kubernetes-commit: da707e8b3e96e2f5d91ed474c16c5edde7192bf2	2020-08-12 09:30:14 +00:00
Jordan Liggitt	15bf6edb65	Update to json-patch 4.8.0 Kubernetes-commit: debb7ac0a7dde3a673f42b3eef8b4802a9e4750f	2020-08-08 10:04:13 -04:00
Kubernetes Publisher	04a6536a6b	Merge pull request #90020 from liggitt/json-raw-1.17 Manual cherry pick of #89833: preserve integers decoding raw JSON values Kubernetes-commit: 72f8a95ea4a373ad001f504d00def972918127a5	2020-04-29 01:17:20 +00:00
Jordan Liggitt	11d6f6b94b	kube-openapi bump to release-1.17 Kubernetes-commit: 65319f4fa0a64befbea06729c2b018f86618c831	2020-04-09 15:10:05 -04:00