[KFLUXBUGS-1105]: Retrieve Component before updating status for build…

…-nudged-by (#444) * [KFLUXBUGS-1105]: Retrieve Component before updating status Signed-off-by: John Collier <[email protected]> * Add log Signed-off-by: John Collier <[email protected]> --------- Signed-off-by: John Collier <[email protected]>
redhat-appstudio · Feb 13, 2024 · 4863efd · 4863efd
1 parent 3041882
commit 4863efd
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/controllers/webhooks/component_webhook.go b/controllers/webhooks/component_webhook.go
@@ -86,13 +86,22 @@ func (r *ComponentWebhook) UpdateNudgedComponentStatus(ctx context.Context, obj
 
 		// Add the component to the status if it's not already present
 		if !util.StrInList(compName, nudgedComp.Status.BuildNudgedBy) {
-			nudgedComp.Status.BuildNudgedBy = append(nudgedComp.Status.BuildNudgedBy, compName)
 
 			// Update the Component's status - retry on conflict
-			err = retry.RetryOnConflict(retry.DefaultRetry, func() error {
-				err = r.client.Status().Update(ctx, nudgedComp)
+			err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
+				currentNudgedComp := &appstudiov1alpha1.Component{}
+				err := r.client.Get(ctx, types.NamespacedName{Namespace: comp.Namespace, Name: nudgedCompName}, currentNudgedComp)
+				if err != nil {
+					return err
+				}
+				currentNudgedComp.Status.BuildNudgedBy = append(currentNudgedComp.Status.BuildNudgedBy, compName)
+				err = r.client.Status().Update(ctx, currentNudgedComp)
 				return err
 			})
+			if err != nil {
+				componentlog.Error(err, "error setting build-nudged-by in status")
+			}
+
 		}
 
 	}