Update dependencies to v0.18.14 tag

Merge pull request #94148 from liggitt/json-patch-1.18
[1.18] Update to json-patch 4.9.0 Kubernetes-commit: 62eff8d42cff51ddab6ef3c5b3f7380a5c02815f
2026-02-15 00:07:52 +08:00 · 2020-12-18 17:51:41 +00:00 · 2020-09-03 13:57:48 +00:00 · 2020-08-20 17:14:41 -04:00 · 2020-08-12 05:55:01 +00:00 · 2020-08-08 09:59:16 -04:00
5 changed files with 46 additions and 40 deletions
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -76,7 +76,7 @@
 		},
 		{
 			"ImportPath": "github.com/evanphx/json-patch",
-			"Rev": "v4.2.0"
+			"Rev": "v4.9.0"
 		},
 		{
 			"ImportPath": "github.com/fsnotify/fsnotify",
@@ -238,6 +238,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"
@@ -348,19 +352,19 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "v0.18.0-beta.1"
+			"Rev": "v0.18.14"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "v0.18.0-beta.1"
+			"Rev": "v0.18.14"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "v0.18.0-beta.1"
+			"Rev": "v0.18.14"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
-			"Rev": "v0.18.0-beta.1"
+			"Rev": "v0.18.14"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
@@ -372,15 +376,15 @@
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi",
-			"Rev": "bf4fb3bd569c"
+			"Rev": "61e04a5be9a6"
 		},
 		{
 			"ImportPath": "k8s.io/utils",
-			"Rev": "5f6fbceb4c31"
+			"Rev": "a9aa75ae1b89"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/v3",
-			"Rev": "5e70324e7c1c"
+			"Rev": "v3.0.0"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/yaml",
--- a/go.mod
+++ b/go.mod
@@ -5,18 +5,18 @@ module k8s.io/sample-controller
 go 1.13

 require (
-	k8s.io/api v0.18.0-beta.1
-	k8s.io/apimachinery v0.18.0-beta.1
-	k8s.io/client-go v0.18.0-beta.1
-	k8s.io/code-generator v0.18.0-beta.1
+	k8s.io/api v0.18.14
+	k8s.io/apimachinery v0.18.14
+	k8s.io/client-go v0.18.14
+	k8s.io/code-generator v0.18.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.18.0-beta.1
-	k8s.io/apimachinery => k8s.io/apimachinery v0.18.0-beta.1
-	k8s.io/client-go => k8s.io/client-go v0.18.0-beta.1
-	k8s.io/code-generator => k8s.io/code-generator v0.18.0-beta.1
+	k8s.io/api => k8s.io/api v0.18.14
+	k8s.io/apimachinery => k8s.io/apimachinery v0.18.14
+	k8s.io/client-go => k8s.io/client-go v0.18.14
+	k8s.io/code-generator => k8s.io/code-generator v0.18.14
 )
--- a/go.sum
+++ b/go.sum
@@ -26,8 +26,8 @@ github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/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=
@@ -116,6 +116,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/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
@@ -195,10 +197,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.18.0-beta.1/go.mod h1:NcLIcCLuI/dH9R6reQzXe8l3GZMBqYyV7IpCg8ELWNw=
-k8s.io/apimachinery v0.18.0-beta.1/go.mod h1:5X8oEhnd931nEg6/Nkumo00nT6ZsCLp2h7Xwd7Ym6P4=
-k8s.io/client-go v0.18.0-beta.1/go.mod h1:72uk0nKrRYexhTPsiAYy8eL0jtwA5f6HsAQSMFDZ45c=
-k8s.io/code-generator v0.18.0-beta.1/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc=
+k8s.io/api v0.18.14/go.mod h1:rMEP0KbqUY9Bm/nbQBXtUizL9r7XvD7IV1XhnGSHsy4=
+k8s.io/apimachinery v0.18.14/go.mod h1:PF5taHbXgTEJLU+xMypMmYTXTWPJ5LaW8bfsisxnEXk=
+k8s.io/client-go v0.18.14/go.mod h1:fpZHBter1MB6bs+GISolsmIRsGlBEJyd0mllE0H9f2Y=
+k8s.io/code-generator v0.18.14/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c=
 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20200114144118-36b2048a9120 h1:RPscN6KhmG54S33L+lr3GS+oD1jmchIU0ll519K6FA4=
 k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
@@ -206,13 +208,13 @@ 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-20200121204235-bf4fb3bd569c h1:/KUFqjjqAcY4Us6luF5RDNZ16KJtb49HfR3ZHB9qYXM=
-k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
-k8s.io/utils v0.0.0-20200117235808-5f6fbceb4c31 h1:KCcLuc/HD1RogJgEbZi9ObRuLv1bgiRCfAbidLKrUpg=
-k8s.io/utils v0.0.0-20200117235808-5f6fbceb4c31/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
+k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 h1:Oh3Mzx5pJ+yIumsAD0MOECPVeXsVot0UkiaCGVyfGQY=
+k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
+k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 h1:d4vVOjXm687F1iLSP2q3lyPPuyvTUt3aVoBpi2DqRsU=
+k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
 sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
-sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200207200219-5e70324e7c1c h1:xQP7F7Lntt2dtYmg12WPQHObOrAyPHlMWP1JVSa79GM=
-sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200207200219-5e70324e7c1c/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
+sigs.k8s.io/structured-merge-diff/v3 v3.0.0 h1:dOmIZBMfhcHS09XZkMyUgkq5trg3/jRyJYFZUiaOp8E=
+sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
--- a/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/fake/fake_foo.go
+++ b/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/fake/fake_foo.go
@@ -115,7 +115,7 @@ func (c *FakeFoos) UpdateStatus(ctx context.Context, foo *v1alpha1.Foo, opts v1.
 }

 // Delete takes name of the foo and deletes it. Returns an error if one occurs.
-func (c *FakeFoos) Delete(ctx context.Context, name string, options *v1.DeleteOptions) error {
+func (c *FakeFoos) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
 	_, err := c.Fake.
 		Invokes(testing.NewDeleteAction(foosResource, c.ns, name), &v1alpha1.Foo{})

@@ -123,8 +123,8 @@ func (c *FakeFoos) Delete(ctx context.Context, name string, options *v1.DeleteOp
 }

 // DeleteCollection deletes a collection of objects.
-func (c *FakeFoos) DeleteCollection(ctx context.Context, options *v1.DeleteOptions, listOptions v1.ListOptions) error {
-	action := testing.NewDeleteCollectionAction(foosResource, c.ns, listOptions)
+func (c *FakeFoos) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
+	action := testing.NewDeleteCollectionAction(foosResource, c.ns, listOpts)

 	_, err := c.Fake.Invokes(action, &v1alpha1.FooList{})
 	return err
--- a/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/foo.go
+++ b/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/foo.go
@@ -41,8 +41,8 @@ type FooInterface interface {
 	Create(ctx context.Context, foo *v1alpha1.Foo, opts v1.CreateOptions) (*v1alpha1.Foo, error)
 	Update(ctx context.Context, foo *v1alpha1.Foo, opts v1.UpdateOptions) (*v1alpha1.Foo, error)
 	UpdateStatus(ctx context.Context, foo *v1alpha1.Foo, opts v1.UpdateOptions) (*v1alpha1.Foo, error)
-	Delete(ctx context.Context, name string, opts *v1.DeleteOptions) error
-	DeleteCollection(ctx context.Context, opts *v1.DeleteOptions, listOpts v1.ListOptions) error
+	Delete(ctx context.Context, name string, opts v1.DeleteOptions) error
+	DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error
 	Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.Foo, error)
 	List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.FooList, error)
 	Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
@@ -153,28 +153,28 @@ func (c *foos) UpdateStatus(ctx context.Context, foo *v1alpha1.Foo, opts v1.Upda
 }

 // Delete takes name of the foo and deletes it. Returns an error if one occurs.
-func (c *foos) Delete(ctx context.Context, name string, options *v1.DeleteOptions) error {
+func (c *foos) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("foos").
 		Name(name).
-		Body(options).
+		Body(&opts).
 		Do(ctx).
 		Error()
 }

 // DeleteCollection deletes a collection of objects.
-func (c *foos) DeleteCollection(ctx context.Context, options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+func (c *foos) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
 	var timeout time.Duration
-	if listOptions.TimeoutSeconds != nil {
-		timeout = time.Duration(*listOptions.TimeoutSeconds) * time.Second
+	if listOpts.TimeoutSeconds != nil {
+		timeout = time.Duration(*listOpts.TimeoutSeconds) * time.Second
 	}
 	return c.client.Delete().
 		Namespace(c.ns).
 		Resource("foos").
-		VersionedParams(&listOptions, scheme.ParameterCodec).
+		VersionedParams(&listOpts, scheme.ParameterCodec).
 		Timeout(timeout).
-		Body(options).
+		Body(&opts).
 		Do(ctx).
 		Error()
 }
Author	SHA1	Message	Date
Kubernetes Publisher	89647068cb	Update dependencies to v0.18.14 tag	2020-12-18 17:51:41 +00:00
Kubernetes Publisher	d979ba3a78	Merge pull request #94148 from liggitt/json-patch-1.18 [1.18] Update to json-patch 4.9.0 Kubernetes-commit: 62eff8d42cff51ddab6ef3c5b3f7380a5c02815f	2020-09-03 13:57:48 +00:00
Jordan Liggitt	9efa6c0104	Update json-patch to v4.9.0 tagged release Kubernetes-commit: f28d1007a56fa23c1874b973fa0024eddffc6fac	2020-08-20 17:14:41 -04:00
Kubernetes Publisher	5c2f92ef30	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	2020-08-12 05:55:01 +00:00
Jordan Liggitt	a73c22ff8c	Update to json-patch 4.8.0 Kubernetes-commit: b924a9330380fd993ad9ca4ebb171c1a67ecb51f	2020-08-08 09:59:16 -04:00
Kubernetes Publisher	402682f45e	Merge pull request #90019 from liggitt/json-raw-1.18 Manual cherry pick of #89833: preserve integers decoding raw JSON values Kubernetes-commit: 1533a3d87f7c750263b07a426d47573e41bfd0d8	2020-04-29 12:55:14 +00:00
Jordan Liggitt	1bcabdb7bb	kube-openapi bump to release-1.18 Kubernetes-commit: 34726e1b50d1dd7de5972c824db566511813d8b7	2020-04-09 14:51:42 -04:00
Kubernetes Publisher	167e94f6f4	Merge pull request #89449 from saad-ali/automated-cherry-pick-of-#89444-upstream-release-1.18 Automated cherry pick of #89444 upstream release 1.18 Kubernetes-commit: 8be33caaf953ac6fdb5e57435363282e3098616c	2020-03-25 05:07:41 +00:00
Hemant Kumar	efc034341b	bump k8s.io/utils package This fixes bug with xfs mount failing because of xfs_repair being called. Fixes https://github.com/kubernetes/utils/issues/141 Kubernetes-commit: 0630031f85ba508559abcb40a1adca4ac2350056	2020-03-24 17:21:19 -04:00
Kubernetes Publisher	1cf80b89ee	Merge pull request #89343 from aojea/automated-cherry-pick-of-#89341-upstream-release-1.18 Automated cherry pick of #89341: bump k8s.io utils Kubernetes-commit: a4d1f873dd75a547dff75c9de77bc4dfabc5d4e6	2020-03-23 04:54:20 +00:00
Antonio Ojea	86abc3c69e	bump k8s.io utils Fix a bug in k8s.io/utils/net.GetIndexedIP() that wasn't working with IPv6 addresses with leading zeros. Kubernetes-commit: 0c34f5e431c7b0cdc8f41e39e6797422c63532cb	2020-03-22 22:21:47 +01:00
Kubernetes Publisher	feb0ae239c	Merge pull request #89331 from andyzhangx/automated-cherry-pick-of-#89319-upstream-release-1.18 Automated cherry pick of #89319: Update vendored MountSensitive code for Windows Kubernetes-commit: 35d71ed91ceecb9b19d329a39d8553a273035895	2020-03-21 20:41:42 +00:00
marosset	3420767a3c	Updating vendored files Kubernetes-commit: cf790a8d209cb61fe8a97b4947b556cdb77be015	2020-03-20 21:13:48 +00:00
Kubernetes Publisher	08c206a29f	Merge remote-tracking branch 'origin/master' into release-1.18 Kubernetes-commit: 4345b892177bf918d49fea1876bfbe236e251734	2020-03-08 14:53:38 +00:00
Kubernetes Publisher	afa54d0c43	Merge pull request #88875 from apelisse/apply-no-op SSA: Applying same object twice should be a no-op the second time Kubernetes-commit: 71ad0a90205c12e8ebbe6872db30097026916659	2020-03-08 16:40:55 +00:00
Kubernetes Publisher	4272ebdfb8	Merge remote-tracking branch 'origin/master' into release-1.18 Kubernetes-commit: df00300353342181f7930d81c197f52b0d6164de	2020-03-06 20:56:15 +00:00
Antoine Pelisse	9f70ec49bf	Bump sigs.k8s.io/structured-merge-diff to v3 Kubernetes-commit: df41fd932bef1686b30a1abee477c5009ebabe80	2020-03-05 13:09:50 -08:00
Mike Danese	1357d00961	update clients Kubernetes-commit: 86bd06c8820a785cb8d74ef29d4a6a80c08988c0	2020-03-01 08:54:33 -08:00
Kubernetes Publisher	331469446e	Merge remote-tracking branch 'origin/master' into release-1.18 Kubernetes-commit: ee5e5d216da4d3ec8106e3cfc1507599b8787b7b	2020-03-04 20:49:54 +00:00
saad-ali	43ac6031e7	Update dep k8s.io/utils to 0a110f9eb7ab Kubernetes-commit: 22e8189f40fc95b18bad2b59ba2ad20ae7c69ea9	2020-02-28 18:22:45 -08:00