Update dependencies to v0.23.0 tag

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
2026-03-09 00:00:13 +08:00 · 2021-12-07 21:26:29 +00:00 · 2021-12-03 10:00:31 +00:00 · 2021-11-24 10:32:24 -05:00
5 changed files with 20 additions and 19 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.0
+	k8s.io/apimachinery v0.23.0
+	k8s.io/client-go v0.23.0
+	k8s.io/code-generator v0.23.0
 	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.0
+	k8s.io/apimachinery => k8s.io/apimachinery v0.23.0
+	k8s.io/client-go => k8s.io/client-go v0.23.0
+	k8s.io/code-generator => k8s.io/code-generator v0.23.0
 )
--- a/go.sum
+++ b/go.sum
@@ -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.0 h1:WrL1gb73VSC8obi8cuYETJGXEoFNEh3LU0Pt+Sokgro=
+k8s.io/api v0.23.0/go.mod h1:8wmDdLBHBNxtOIytwLstXt5E9PddnZb0GaMcqsvDBpg=
+k8s.io/apimachinery v0.23.0 h1:mIfWRMjBuMdolAWJ3Fd+aPTMv3X9z+waiARMpvvb0HQ=
+k8s.io/apimachinery v0.23.0/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc=
+k8s.io/client-go v0.23.0 h1:vcsOqyPq7XV3QmQRCBH/t9BICJM9Q1M18qahjv+rebY=
+k8s.io/client-go v0.23.0/go.mod h1:hrDnpnK1mSr65lHHcUuIZIXDgEbzc7/683c6hyG4jTA=
+k8s.io/code-generator v0.23.0 h1:lhyd2KJVCEmpjaCpuoooGs+e3xhPwpYvupnNRidO0Ds=
+k8s.io/code-generator v0.23.0/go.mod h1:vQvOhDXhuzqiVfM/YHp+dmg10WDZCchJVObc9MvowsE=
 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=
Author	SHA1	Message	Date
Kubernetes Publisher	88378128f2	Update dependencies to v0.23.0 tag	2021-12-07 21:26:29 +00: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