only update when obj is not nil

rancher · Feb 2, 2018 · ad472c4 · ad472c4
1 parent 151aa66
commit ad472c4
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lifecycle/object.go b/lifecycle/object.go
@@ -59,7 +59,9 @@ func (o *objectLifecycleAdapter) sync(key string, obj runtime.Object) error {
 
 	copyObj := obj.DeepCopyObject()
 	newObj, err := o.lifecycle.Updated(copyObj)
-	o.update(metadata.GetName(), obj, newObj)
+	if newObj != nil {
+		o.update(metadata.GetName(), obj, newObj)
+	}
 	return err
 }
 
@@ -82,7 +84,9 @@ func (o *objectLifecycleAdapter) finalize(metadata metav1.Object, obj runtime.Ob
 
 	copyObj := obj.DeepCopyObject()
 	if newObj, err := o.lifecycle.Finalize(copyObj); err != nil {
-		o.update(metadata.GetName(), obj, newObj)
+		if newObj != nil {
+			o.update(metadata.GetName(), obj, newObj)
+		}
 		return false, err
 	} else if newObj != nil {
 		copyObj = newObj