Update dependencies to v0.24.0-alpha.1 tag

Merge pull request #106530 from FrankYang0529/sample-controller/use-update-status
feat(sample-controller): use UpdateStatus Kubernetes-commit: d4c57acbb7bf9526455998e1ac9db09810604898
2026-02-15 00:07:52 +08:00 · 2021-12-09 05:27:33 +00:00 · 2021-12-08 09:15:57 +00:00 · 2021-12-03 09:57:38 +00:00 · 2021-11-24 23:42:22 +00:00 · 2021-11-24 10:32:24 -05:00
5 changed files with 21 additions and 22 deletions
--- a/README.md
+++ b/README.md
@@ -174,3 +174,4 @@ 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).Update(context.TODO(), fooCopy, metav1.UpdateOptions{})
+	_, err := c.sampleclientset.SamplecontrollerV1alpha1().Foos(foo.Namespace).UpdateStatus(context.TODO(), fooCopy, metav1.UpdateOptions{})
 	return err
 }

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

 func (f *fixture) expectUpdateFooStatusAction(foo *samplecontroller.Foo) {
-	action := core.NewUpdateAction(schema.GroupVersionResource{Resource: "foos"}, foo.Namespace, foo)
-	// TODO: Until #38113 is merged, we can't use Subresource
-	//action.Subresource = "status"
+	action := core.NewUpdateSubresourceAction(schema.GroupVersionResource{Resource: "foos"}, "status", foo.Namespace, foo)
 	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.0
-	k8s.io/apimachinery v0.24.0-alpha.0
-	k8s.io/client-go v0.24.0-alpha.0
-	k8s.io/code-generator v0.24.0-alpha.0
+	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/klog/v2 v2.30.0
 )

 replace (
-	k8s.io/api => k8s.io/api v0.24.0-alpha.0
-	k8s.io/apimachinery => k8s.io/apimachinery v0.24.0-alpha.0
-	k8s.io/client-go => k8s.io/client-go v0.24.0-alpha.0
-	k8s.io/code-generator => k8s.io/code-generator v0.24.0-alpha.0
+	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
 )
--- 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.0 h1:M/31Z1GKgTE0/fWu2/arAfvIoMmL/oQ5ykYN9RTzgKg=
-k8s.io/api v0.24.0-alpha.0/go.mod h1:deWo+4OwHTtia+zwLZirxNA0Unp1Y/a4lsmydSRUqp8=
-k8s.io/apimachinery v0.24.0-alpha.0 h1:FChRBdwz3dJDpfIBXaSRlDQQ6FOHiRvgAHaRAynx73s=
-k8s.io/apimachinery v0.24.0-alpha.0/go.mod h1:SqloDTPqePPNhEp8K4qUgqpKc3tE+ymn05iIUbSAQ7g=
-k8s.io/client-go v0.24.0-alpha.0 h1:qeU8M+gy+bTDzJQMMy6VsvYXtNJAPkP0QvJw/Cl7gnA=
-k8s.io/client-go v0.24.0-alpha.0/go.mod h1:tQEmSne6/r+o6F5m9q0zx2R7zgm9xXmnNuIgsUWcMxw=
-k8s.io/code-generator v0.24.0-alpha.0 h1:l+EhZ6NK7rz4xfjx7qRR/GtArDiFIRDBYVRqyfEu6hQ=
-k8s.io/code-generator v0.24.0-alpha.0/go.mod h1:mObJbeTbuUA4VfVCtZI0nS/oLJRp+s2A07sH+fMregI=
+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/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=
@@ -639,7 +639,7 @@ 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.2.0 h1:kDvPBbnPk+qYmkHmSo8vKGp438IASWofnbbUKDE/bv0=
-sigs.k8s.io/structured-merge-diff/v4 v4.2.0/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
+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/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
Author	SHA1	Message	Date
Kubernetes Publisher	d41c4a6ae5	Update dependencies to v0.24.0-alpha.1 tag	2021-12-09 05:27:33 +00:00
Kubernetes Publisher	b08776b53a	Merge pull request #106530 from FrankYang0529/sample-controller/use-update-status feat(sample-controller): use UpdateStatus Kubernetes-commit: d4c57acbb7bf9526455998e1ac9db09810604898	2021-12-08 09:15:57 +00:00
Davanum Srinivas	44e50f65ab	staging: add dummy commit to trigger gomod update (#106794 ) add newline to all staging repos Signed-off-by: Davanum Srinivas <davanum@gmail.com> Co-authored-by: Nikhita Raghunath <nikitaraghunath@gmail.com> Kubernetes-commit: 555623c07eabf22864f6147736fa191e020cca25	2021-12-03 09:57:38 +00:00
Kubernetes Publisher	ff730d68ab	Merge pull request #106660 from liggitt/smd-merge Revert sigs.k8s.io/structured-merge-diff/v4 to v4.1.2 Kubernetes-commit: aff056d8a197f6a404ad5e02210ca662d16c3dbe	2021-11-24 23:42:22 +00:00
Jordan Liggitt	d8df7de944	Revert sigs.k8s.io/structured-merge-diff/v4 to v4.1.2 Kubernetes-commit: ed68909177eca588731bc153d2f69dd235e8fe10	2021-11-24 10:32:24 -05:00
Frank Yang	0edb970c17	feat(sample-controller): use update status Signed-off-by: Frank Yang <yangpoan@gmail.com> Kubernetes-commit: 01e9c80d90c5a6da8278d0785ef583e01f901c1e	2021-11-18 22:00:54 +08:00