Update dependencies to v0.23.8 tag

Merge pull request #108791 from aojea/cherry-pick-108772
Cherry pick 108772 Kubernetes-commit: 05a09629ab8207a870c9178b0f5694aa92919d92
2026-03-09 00:00:13 +08:00 · 2022-06-17 00:16:55 +00:00 · 2022-03-31 09:41:14 +00:00 · 2022-03-17 16:03:10 +01:00 · 2022-01-24 18:04:46 +00:00 · 2022-01-19 20:51:54 +09:00
6 changed files with 30 additions and 25 deletions
--- a/README.md
+++ b/README.md
@@ -174,4 +174,3 @@ k8s.io/client-go.
 https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/sample-controller.
 Code changes are made in that location, merged into k8s.io/kubernetes and
 later synced here.
-
--- a/controller.go
+++ b/controller.go
@@ -328,7 +328,7 @@ func (c *Controller) updateFooStatus(foo *samplev1alpha1.Foo, deployment *appsv1
 	// we must use Update instead of UpdateStatus to update the Status block of the Foo resource.
 	// UpdateStatus will not allow changes to the Spec of the resource,
 	// which is ideal for ensuring nothing other than resource status has been updated.
-	_, err := c.sampleclientset.SamplecontrollerV1alpha1().Foos(foo.Namespace).UpdateStatus(context.TODO(), fooCopy, metav1.UpdateOptions{})
+	_, err := c.sampleclientset.SamplecontrollerV1alpha1().Foos(foo.Namespace).Update(context.TODO(), fooCopy, metav1.UpdateOptions{})
 	return err
 }

--- a/controller_test.go
+++ b/controller_test.go
@@ -236,7 +236,9 @@ func (f *fixture) expectUpdateDeploymentAction(d *apps.Deployment) {
 }

 func (f *fixture) expectUpdateFooStatusAction(foo *samplecontroller.Foo) {
-	action := core.NewUpdateSubresourceAction(schema.GroupVersionResource{Resource: "foos"}, "status", foo.Namespace, foo)
+	action := core.NewUpdateAction(schema.GroupVersionResource{Resource: "foos"}, foo.Namespace, foo)
+	// TODO: Until #38113 is merged, we can't use Subresource
+	//action.Subresource = "status"
 	f.actions = append(f.actions, action)
 }

--- a/go.mod
+++ b/go.mod
@@ -5,16 +5,16 @@ module k8s.io/sample-controller
 go 1.16

 require (
-	k8s.io/api v0.24.0-alpha.1
-	k8s.io/apimachinery v0.24.0-alpha.1
-	k8s.io/client-go v0.24.0-alpha.1
-	k8s.io/code-generator v0.24.0-alpha.1
+	k8s.io/api v0.23.8
+	k8s.io/apimachinery v0.23.8
+	k8s.io/client-go v0.23.8
+	k8s.io/code-generator v0.23.8
 	k8s.io/klog/v2 v2.30.0
 )

 replace (
-	k8s.io/api => k8s.io/api v0.24.0-alpha.1
-	k8s.io/apimachinery => k8s.io/apimachinery v0.24.0-alpha.1
-	k8s.io/client-go => k8s.io/client-go v0.24.0-alpha.1
-	k8s.io/code-generator => k8s.io/code-generator v0.24.0-alpha.1
+	k8s.io/api => k8s.io/api v0.23.8
+	k8s.io/apimachinery => k8s.io/apimachinery v0.23.8
+	k8s.io/client-go => k8s.io/client-go v0.23.8
+	k8s.io/code-generator => k8s.io/code-generator v0.23.8
 )
--- a/go.sum
+++ b/go.sum
@@ -336,8 +336,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210825183410-e898025ed96a h1:bRuuGXV8wwSdGTB+CtJf+FjgO1APK1CoO39T4BN/XBw=
-golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211209124913-491a49abca63 h1:iocB37TsdFuN6IBRZ+ry36wrkoV51/tl5vOWqkcPGvY=
+golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -614,14 +614,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/api v0.24.0-alpha.1 h1:RVP4DJ/3RW+8HLxDGMwgJ2wJFzLQjqVZZB0cGEpYV2I=
-k8s.io/api v0.24.0-alpha.1/go.mod h1:iHNArmntqNPU7O1yswszG/LNV2MKEOnLxJjxN/zgeo8=
-k8s.io/apimachinery v0.24.0-alpha.1 h1:gtxRrchGNsU1sYUkeQU/09TfAo03yW37IdlhQr8NHwo=
-k8s.io/apimachinery v0.24.0-alpha.1/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc=
-k8s.io/client-go v0.24.0-alpha.1 h1:MNi7ErYxZp7dKB5VSgdcJpPkFQ7mmzQEGDfCO6pM6xQ=
-k8s.io/client-go v0.24.0-alpha.1/go.mod h1:MIOKdu6ZKg3fqYYFT2rHvLcRWUy0f9gTc42lyvLS420=
-k8s.io/code-generator v0.24.0-alpha.1 h1:4i7kLPCyH1+ETiffyg4yrBvlasCDrG9tOnxUSm2tCZU=
-k8s.io/code-generator v0.24.0-alpha.1/go.mod h1:vQvOhDXhuzqiVfM/YHp+dmg10WDZCchJVObc9MvowsE=
+k8s.io/api v0.23.8 h1:tBMQ7z7s1NUUii649OaGe962xPacUzHwnGEj6Ahneu0=
+k8s.io/api v0.23.8/go.mod h1:26VNldp5fRyiZ/tEO/3V8RJW+In1Aay3YkxsDzkvuWU=
+k8s.io/apimachinery v0.23.8 h1:6Z+0LLvvPnAF6GXbUcBmzB1+b/AnDZpVd2N0MxUJcl0=
+k8s.io/apimachinery v0.23.8/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM=
+k8s.io/client-go v0.23.8 h1:0POvFP1/bN0DQYO41ks1tdzIBf9I+afqpUUNedyZ3T4=
+k8s.io/client-go v0.23.8/go.mod h1:m9GosuTn6NlShCjb5XvrRlNDuHeIbGrsDLxjDoS6gec=
+k8s.io/code-generator v0.23.8 h1:YHHiSaUd2uzLhUpzh1Wlsz20ah0BG6V3gYjkYSte8Gs=
+k8s.io/code-generator v0.23.8/go.mod h1:S0Q1JVA+kSzTI1oUvbKAxZY/DYbA/ZUb4Uknog12ETk=
 k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c h1:GohjlNKauSai7gN4wsJkeZ3WAJx4Sh+oT/b5IYn5suA=
 k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
@@ -631,15 +631,15 @@ k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 h1:E3J9oCLlaobFUqsjG9DfKbP2BmgwBL2p7pn0A3dG9W4=
 k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk=
 k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
-k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b h1:wxEMGetGMur3J1xuGLQY7GEQYg9bZxKn3tKo5k/eYcs=
-k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
+k8s.io/utils v0.0.0-20211116205334-6203023598ed h1:ck1fRPWPJWsMd8ZRFsWc6mh/zHp5fZ/shhbrgPUxDAE=
+k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 h1:fD1pz4yfdADVNfFmcP2aBEtudwUQ1AlLnRBALr33v3s=
 sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
-sigs.k8s.io/structured-merge-diff/v4 v4.1.2 h1:Hr/htKFmJEbtMgS/UD0N+gtgctAqz81t3nu+sPzynno=
-sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
+sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y=
+sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
 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/clientset.go
+++ b/pkg/generated/clientset/versioned/clientset.go
@@ -61,6 +61,10 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface {
 func NewForConfig(c *rest.Config) (*Clientset, error) {
 	configShallowCopy := *c

+	if configShallowCopy.UserAgent == "" {
+		configShallowCopy.UserAgent = rest.DefaultKubernetesUserAgent()
+	}
+
 	// share the transport between all clients
 	httpClient, err := rest.HTTPClientFor(&configShallowCopy)
 	if err != nil {
Author	SHA1	Message	Date
Kubernetes Publisher	139efad3bf	Update dependencies to v0.23.8 tag	2022-06-17 00:16:55 +00:00
Kubernetes Publisher	9a746c631a	Merge pull request #108791 from aojea/cherry-pick-108772 Cherry pick 108772 Kubernetes-commit: 05a09629ab8207a870c9178b0f5694aa92919d92	2022-03-31 09:41:14 +00:00
Antonio Ojea	b5d8875482	client-go: update generated Kubernetes-commit: f628706339c120c19d28ccfa7b1a580516be1d1a	2022-03-17 16:03:10 +01:00
Kubernetes Publisher	13594af1d5	Merge pull request #107638 from gjkim42/cherry-pick-of-#106473-upstream-release-1.23 Update k/utils to v0.0.0-20211116205334-6203023598ed Kubernetes-commit: 83863a0f00bc8048f2ddfcfd60eec0041056b6c0	2022-01-24 18:04:46 +00:00
Gunju Kim	ef63d81afd	Update k/utils to v0.0.0-20211116205334-6203023598ed Kubernetes-commit: 4935e0a527e3743fc8ba768d3dc93c5f85142f10	2022-01-19 20:51:54 +09:00
Kubernetes Publisher	5e43b30045	Merge pull request #107567 from jiahuif-forks/automated-cherry-pick-of-#107565-upstream-release-1.23 Automated cherry pick of #107565: upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1 Kubernetes-commit: 3426f6ceaf92ad40de9f381c20d054c8fef10c03	2022-01-15 06:35:54 +00:00
Jiahui Feng	daf4f12605	generated: ./hack/update-vendor.sh Kubernetes-commit: 89d8be52ef47c6a5d000a515b41f05567378a97b	2022-01-14 10:58:50 -08:00
Kubernetes Publisher	21fcb2652b	Merge pull request #106835 from cpanato/go117-release-1-23 [go1.17] Update to go1.17.5 and golang.org/x/net to v0.0.0-20211209124913-491a49abca63 Kubernetes-commit: 08ad4f287316f941988fe1e1b8f425cded157048	2021-12-13 22:22:59 +00:00
Carlos Panato	5ac825198c	dependencies: Update golang.org/x/net to v0.0.0-20211209124913-491a49abca63 Signed-off-by: Carlos Panato <ctadeu@gmail.com> Kubernetes-commit: d065f7ffe77b46642f4f0802c0ad700b9d88d0ec	2021-12-10 17:39:02 +01:00
Kubernetes Publisher	b1f957b124	Merge pull request #106661 from liggitt/automated-cherry-pick-of-#106660-upstream-release-1.23 Automated cherry pick of #106660: Revert sigs.k8s.io/structured-merge-diff/v4 to v4.1.2 Kubernetes-commit: 724289524084f6edbbe53e31d2c6e636343fdebb	2021-12-03 10:00:31 +00:00
Jordan Liggitt	4f5033a5b2	Revert sigs.k8s.io/structured-merge-diff/v4 to v4.1.2 Kubernetes-commit: d148bbcee39e3c290f9d5663e848a398d402152d	2021-11-24 10:32:24 -05:00