Merge pull request #51 from ibuildthecloud/master

Properly compare and mutate status
rancher · Dec 5, 2019 · a1c3d06 · a1c3d06
2 parents 2a833f7 + 661f00f
commit a1c3d06
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/pkg/controller-gen/generators/type_go.go b/pkg/controller-gen/generators/type_go.go
@@ -343,24 +343,24 @@ func (a *{{.lowerName}}StatusHandler) sync(key string, obj *{{.version}}.{{.type
 		return obj, nil
 	}
 
-	status := obj.Status
+	origStatus := obj.Status
 	obj = obj.DeepCopy()
 	newStatus, err := a.handler(obj, obj.Status)
 	if err != nil {
 		// Revert to old status on error
-		newStatus = *status.DeepCopy()
+		newStatus = *origStatus.DeepCopy()
 	}
 
+	obj.Status = newStatus
 	if a.condition != "" {
 		if errors.IsConflict(err) {
 			a.condition.SetError(obj, "", nil)
 		} else {
 			a.condition.SetError(obj, "", err)
 		}
 	}
-	if !equality.Semantic.DeepEqual(status, newStatus) {
+	if !equality.Semantic.DeepEqual(origStatus, obj.Status) {
 		var newErr error
-		obj.Status = newStatus
 		obj, newErr = a.client.UpdateStatus(obj)
 		if err == nil {
 			err = newErr