Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix sts webhook error #2291

Merged
merged 9 commits into from
Apr 26, 2020
Merged

Fix sts webhook error #2291

Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
53f2b59
Update statefulset.go
Apr 25, 2020
8632002
fix nil problem
Apr 26, 2020
88ed71e
fix lint
Apr 26, 2020
847bcf5
fix lint
Apr 26, 2020
46db998
Merge branch 'master' into revise_webhook
DanielZhangQD Apr 26, 2020
cda1c4c
remove redundent code
Apr 26, 2020
9bcc272
Merge branch 'master' into revise_webhook
Yisaer Apr 26, 2020
6e1b478
Merge branch 'master' into revise_webhook
Yisaer Apr 26, 2020
b627a66
Merge branch 'master' into revise_webhook
sre-bot Apr 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions pkg/webhook/statefulset/statefulset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func (sc *StatefulSetAdmissionControl) AdmitStatefulSets(ar *admission.Admission

klog.Infof("admit %s [%s/%s]", setResource, namespace, name)

stsObjectMeta, stsPartition, err := getStsAttributes(ar.OldObject.Raw, apiVersion)
stsObjectMeta, stsPartition, err := getStsAttributes(ar.OldObject.Raw)
if err != nil {
err = fmt.Errorf("statefulset %s/%s, decode request failed, err: %v", namespace, name, err)
klog.Error(err)
Expand Down Expand Up @@ -110,27 +110,23 @@ func (sc *StatefulSetAdmissionControl) AdmitStatefulSets(ar *admission.Admission
return util.ARFail(err)
}

setPartition := *(stsPartition)
if setPartition > 0 && setPartition <= int32(partition) {
klog.Infof("statefulset %s/%s has been protect by partition %s annotations", namespace, name, partitionStr)
return util.ARFail(errors.New("protect by partition annotation"))
if stsPartition != nil {
if *stsPartition > 0 && *stsPartition <= int32(partition) {
klog.Infof("statefulset %s/%s has been protect by partition %s annotations", namespace, name, partitionStr)
return util.ARFail(errors.New("protect by partition annotation"))
}
klog.Infof("admit statefulset %s/%s update partition to %d, protect partition is %d", namespace, name, *stsPartition, partition)
}
klog.Infof("admit statefulset %s/%s update partition to %d, protect partition is %d", namespace, name, setPartition, partition)
return util.ARSuccess()
}

func getStsAttributes(data []byte, apiVersion string) (*metav1.ObjectMeta, *int32, error) {
if apiVersion == "v1" {
set := apps.StatefulSet{}
if _, _, err := deserializer.Decode(data, nil, &set); err != nil {
return nil, nil, err
}
return &(set.ObjectMeta), set.Spec.UpdateStrategy.RollingUpdate.Partition, nil
}

func getStsAttributes(data []byte) (*metav1.ObjectMeta, *int32, error) {
set := apps.StatefulSet{}
if _, _, err := deserializer.Decode(data, nil, &set); err != nil {
return nil, nil, err
}
return &(set.ObjectMeta), set.Spec.UpdateStrategy.RollingUpdate.Partition, nil
if set.Spec.UpdateStrategy.RollingUpdate != nil {
return &(set.ObjectMeta), set.Spec.UpdateStrategy.RollingUpdate.Partition, nil
}
return &(set.ObjectMeta), nil, nil
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the code seems identical no matter what apiVersion is?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated.

}