update freight after invoke promoMechanism

Signed-off-by: Phuong D. Nguyen <knowledge.phuongnguyen@gmail.com>
akuity · Apr 22, 2024 · 41751fa · 41751fa
1 parent a79a28f
commit 41751fa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/internal/controller/promotion/git.go b/internal/controller/promotion/git.go
@@ -139,7 +139,7 @@ func (g *gitMechanism) Promote(
 		); err != nil {
 			return nil, newFreight, err
 		}
-		newStatus = aggregateGitPromoStatus(newStatus, *otherStatus).WithFreight(&newFreight)
+		newStatus = aggregateGitPromoStatus(newStatus, *otherStatus)
 	}
 
 	logger.Debugf("done executing %s", g.name)

diff --git a/internal/controller/promotions/promotions.go b/internal/controller/promotions/promotions.go
@@ -452,18 +452,12 @@ func (r *reconciler) promote(
 	if err != nil {
 		return nil, err
 	}
-	// record the freight reference to the promotion's status
-	err = kubeclient.PatchStatus(ctx, r.kargoClient, &promo, func(status *kargoapi.PromotionStatus) {
-		status.Freight = &targetFreightRef
-	})
-	if err != nil {
-		logger.Errorf("Promotion status patch failed: %v", err)
-	}
 
 	newStatus, nextFreight, err := r.promoMechanisms.Promote(ctx, stage, &promo, targetFreightRef)
 	if err != nil {
 		return nil, err
 	}
+	newStatus = newStatus.WithFreight(&targetFreight)
 
 	logger.Debugf("promotion %s", newStatus.Phase)