fix: Use a copied object to update (#541)

numaproj · Feb 14, 2023 · f8e7daa · f8e7daa
1 parent f0d9fc1
commit f8e7daa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pkg/reconciler/isbsvc/controller.go b/pkg/reconciler/isbsvc/controller.go
@@ -65,7 +65,8 @@ func (r *interStepBufferServiceReconciler) Reconcile(ctx context.Context, req ct
 		log.Errorw("Reconcile error", zap.Error(reconcileErr))
 	}
 	if r.needsUpdate(isbs, isbsCopy) {
-		if err := r.client.Update(ctx, isbsCopy); err != nil {
+		// Update with a DeepCopy because .Status will be cleaned up.
+		if err := r.client.Update(ctx, isbsCopy.DeepCopy()); err != nil {
 			return reconcile.Result{}, err
 		}
 	}

diff --git a/pkg/reconciler/pipeline/controller.go b/pkg/reconciler/pipeline/controller.go
@@ -76,14 +76,14 @@ func (r *pipelineReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 	log := r.logger.With("namespace", pl.Namespace).With("pipeline", pl.Name)
 	plCopy := pl.DeepCopy()
 	ctx = logging.WithLogger(ctx, log)
-
 	result, reconcileErr := r.reconcile(ctx, plCopy)
 	if reconcileErr != nil {
 		log.Errorw("Reconcile error", zap.Error(reconcileErr))
 	}
 	plCopy.Status.LastUpdated = metav1.Now()
 	if needsUpdate(pl, plCopy) {
-		if err := r.client.Update(ctx, plCopy); err != nil {
+		// Update with a DeepCopy because .Status will be cleaned up.
+		if err := r.client.Update(ctx, plCopy.DeepCopy()); err != nil {
 			return result, err
 		}
 	}