rancher/norman
1
0
Fork 0
mirror of https://github.com/rancher/norman.git synced 2025-08-27 11:28:41 +00:00
Code Issues Releases Wiki Activity

Merge pull request #206 from ibuildthecloud/master

Browse Source 
After failing to remove finalizer refresh finalizer list
This commit is contained in:
Darren Shepherd 2018-10-15 16:12:14 -07:00 committed by GitHub
commit 04cb04ac06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lifecycle/object.go
View File

@ -97,6 +97,7 @@ func (o *objectLifecycleAdapter) finalize(metadata metav1.Object, obj runtime.Ob
} }
func (o *objectLifecycleAdapter) removeFinalizer(name string, obj runtime.Object) error { func (o *objectLifecycleAdapter) removeFinalizer(name string, obj runtime.Object) error {
for i := 0; i < 3; i++ {
metadata, err := meta.Accessor(obj) metadata, err := meta.Accessor(obj)
if err != nil { if err != nil {
return err return err
@ -111,8 +112,7 @@ func (o *objectLifecycleAdapter) removeFinalizer(name string, obj runtime.Object
} }
metadata.SetFinalizers(finalizers) metadata.SetFinalizers(finalizers)
for i := 0; i < 3; i++ { _, err = o.objectClient.Update(metadata.GetName(), obj)
_, err := o.objectClient.Update(metadata.GetName(), obj)
if err == nil { if err == nil {
return nil return nil
} }
@ -121,16 +121,9 @@ func (o *objectLifecycleAdapter) removeFinalizer(name string, obj runtime.Object
if err != nil { if err != nil {
return err return err
} }
metadata, err := meta.Accessor(obj)
if err != nil {
return err
} }
metadata.SetFinalizers(finalizers) return fmt.Errorf("failed to remove finalizer on %s", name)
}
return fmt.Errorf("failed to remove finalizer on %s:%s", metadata.GetNamespace(), metadata.GetName())
} }
func (o *objectLifecycleAdapter) createKey() string { func (o *objectLifecycleAdapter) createKey() string {