github/sample-controller
github/sample-controller
3
0
Fork 0
mirror of https://github.com/kubernetes/sample-controller.git synced 2025-01-19 16:12:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #106530 from FrankYang0529/sample-controller/use-update-status

Browse Source 
feat(sample-controller): use UpdateStatus

Kubernetes-commit: d4c57acbb7bf9526455998e1ac9db09810604898
This commit is contained in:
Kubernetes Publisher 2021-12-08 00:43:45 -08:00
commit b08776b53a
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controller.go
View File

@ -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. // 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, // UpdateStatus will not allow changes to the Spec of the resource,
// which is ideal for ensuring nothing other than resource status has been updated. // 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 return err
} }

4
controller_test.go
View File

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

8
go.mod
View File

@ -6,15 +6,15 @@ go 1.16
require ( require (
k8s.io/api v0.0.0-20211203085948-25b7aa9e86de k8s.io/api v0.0.0-20211203085948-25b7aa9e86de
k8s.io/apimachinery v0.0.0-20211203013834-5f072755815a k8s.io/apimachinery v0.0.0-20211208090001-15877ef535ae
k8s.io/client-go v0.0.0-20211203090726-d85d0d914a32 k8s.io/client-go v0.0.0-20211208050435-c713f38723cb
k8s.io/code-generator v0.0.0-20211203013834-993e1ce84bc9 k8s.io/code-generator v0.0.0-20211203013834-993e1ce84bc9
k8s.io/klog/v2 v2.30.0 k8s.io/klog/v2 v2.30.0
) )
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20211203085948-25b7aa9e86de k8s.io/api => k8s.io/api v0.0.0-20211203085948-25b7aa9e86de
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211203013834-5f072755815a k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211208090001-15877ef535ae
k8s.io/client-go => k8s.io/client-go v0.0.0-20211203090726-d85d0d914a32 k8s.io/client-go => k8s.io/client-go v0.0.0-20211208050435-c713f38723cb
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211203013834-993e1ce84bc9 k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211203013834-993e1ce84bc9
) )

8
go.sum
View File

@ -616,10 +616,10 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
honnef.co/go/tools v0.0.1-2020.1.4/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.0.0-20211203085948-25b7aa9e86de h1:sonP3TZF8wLYB7pZ9U+cFOmU+aowMk08AOJQLLLlE+c= k8s.io/api v0.0.0-20211203085948-25b7aa9e86de h1:sonP3TZF8wLYB7pZ9U+cFOmU+aowMk08AOJQLLLlE+c=
k8s.io/api v0.0.0-20211203085948-25b7aa9e86de/go.mod h1:UuggGDUdGB3f6prC8FzrBGPJ+A+oIqVWmF5HV1VeEIM= k8s.io/api v0.0.0-20211203085948-25b7aa9e86de/go.mod h1:UuggGDUdGB3f6prC8FzrBGPJ+A+oIqVWmF5HV1VeEIM=
k8s.io/apimachinery v0.0.0-20211203013834-5f072755815a h1:oZgEV6uZiZ8pZC+VIbTkAuc0WF32K3tprAzYQXluxAk= k8s.io/apimachinery v0.0.0-20211208090001-15877ef535ae h1:3vwGf0Qs5tyaFa9xtntzX+IPNdCUWiGRVYnA0cjDdT0=
k8s.io/apimachinery v0.0.0-20211203013834-5f072755815a/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc= k8s.io/apimachinery v0.0.0-20211208090001-15877ef535ae/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc=
k8s.io/client-go v0.0.0-20211203090726-d85d0d914a32 h1:JWUp1VPSS3+RgZ6KwlJrj/JuuB0sg3iGo0P//GLQBeg= k8s.io/client-go v0.0.0-20211208050435-c713f38723cb h1:tbntDZ7c+LkEPnURV1oMy9HtSAU7vag2pDilT68PBLg=
k8s.io/client-go v0.0.0-20211203090726-d85d0d914a32/go.mod h1:PXHgGT5hdAyTciimSIiAU6M978zc/4ICjRZKDZ3MdFQ= k8s.io/client-go v0.0.0-20211208050435-c713f38723cb/go.mod h1:4l8IJYdxbF/Uo0zdB+OB48wOhs2/7FtuppsKYTXj1Fw=
k8s.io/code-generator v0.0.0-20211203013834-993e1ce84bc9 h1:uoSv79eOSCBuFaE/OROy10EZYWgQ8aiTg1H1EqW72Dk= k8s.io/code-generator v0.0.0-20211203013834-993e1ce84bc9 h1:uoSv79eOSCBuFaE/OROy10EZYWgQ8aiTg1H1EqW72Dk=
k8s.io/code-generator v0.0.0-20211203013834-993e1ce84bc9/go.mod h1:vQvOhDXhuzqiVfM/YHp+dmg10WDZCchJVObc9MvowsE= k8s.io/code-generator v0.0.0-20211203013834-993e1ce84bc9/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 h1:GohjlNKauSai7gN4wsJkeZ3WAJx4Sh+oT/b5IYn5suA=