github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Fixed logic with updates in initializer plugin

Browse Source
This commit is contained in:
jennybuckley 2017-09-21 11:06:14 -07:00
parent 98ed5dd8a2
commit 44ec189fb0
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugin/pkg/admission/initialization/initialization.go
View File

@ -208,6 +208,13 @@ func (i *initializer) Admit(a admission.Attributes) (err error) {
} }
updated := accessor.GetInitializers() updated := accessor.GetInitializers()
// controllers deployed with an empty initializers.pending have their initializers set to nil
// but should be able to update without changing their manifest
if updated != nil && len(updated.Pending) == 0 && updated.Result == nil {
accessor.SetInitializers(nil)
updated = nil
}
existingAccessor, err := meta.Accessor(a.GetOldObject()) existingAccessor, err := meta.Accessor(a.GetOldObject())
if err != nil { if err != nil {
// if the old object does not have an accessor, but the new one does, error out // if the old object does not have an accessor, but the new one does, error out
@ -222,9 +229,6 @@ func (i *initializer) Admit(a admission.Attributes) (err error) {
glog.V(5).Infof("Modifying uninitialized resource %s", a.GetResource()) glog.V(5).Infof("Modifying uninitialized resource %s", a.GetResource())
if updated != nil && len(updated.Pending) == 0 && updated.Result == nil {
accessor.SetInitializers(nil)
}
// because we are called before validation, we need to ensure the update transition is valid. // because we are called before validation, we need to ensure the update transition is valid.
if errs := validation.ValidateInitializersUpdate(updated, existing, initializerFieldPath); len(errs) > 0 { if errs := validation.ValidateInitializersUpdate(updated, existing, initializerFieldPath); len(errs) > 0 {
return errors.NewInvalid(a.GetKind().GroupKind(), a.GetName(), errs) return errors.NewInvalid(a.GetKind().GroupKind(), a.GetName(), errs)

16
plugin/pkg/admission/initialization/initialization_test.go
View File

@ -152,6 +152,22 @@ func TestAdmitUpdate(t *testing.T) {
newInitializers: &metav1.Initializers{Pending: []metav1.Initializer{{Name: "init.k8s.io"}}}, newInitializers: &metav1.Initializers{Pending: []metav1.Initializer{{Name: "init.k8s.io"}}},
err: "field is immutable once initialization has completed", err: "field is immutable once initialization has completed",
}, },
{
name: "empty initializer list is treated as nil initializer",
oldInitializers: nil,
newInitializers: &metav1.Initializers{},
verifyUpdatedObj: func(obj runtime.Object) (bool, string) {
accessor, err := meta.Accessor(obj)
if err != nil {
return false, "cannot get accessor"
}
if accessor.GetInitializers() != nil {
return false, "expect nil initializers"
}
return true, ""
},
err: "",
},
} }
plugin := initializer{ plugin := initializer{