fix: aggregate phase errors to handle SSA migration conflicts (#2639)

camilamacedo86 · web-flow · commit a34d26922f05 · 2026-04-09T19:45:20.000Z
diff --git a/internal/operator-controller/controllers/clusterobjectset_controller.go b/internal/operator-controller/controllers/clusterobjectset_controller.go
@@ -493,6 +493,7 @@ func (c *ClusterObjectSetReconciler) buildBoxcutterPhases(ctx context.Context, c
 	opts := []boxcutter.RevisionReconcileOption{
 		boxcutter.WithPreviousOwners(previousObjs),
 		boxcutter.WithProbe(boxcutter.ProgressProbeType, progressionProbes),
+		boxcutter.WithAggregatePhaseReconcileErrors(),
 	}
 
 	phases := make([]boxcutter.Phase, 0)

Original file line number	Diff line number	Diff line change
`@@ -493,6 +493,7 @@ func (c *ClusterObjectSetReconciler) buildBoxcutterPhases(ctx context.Context, c`
`493`	`493`	`opts := []boxcutter.RevisionReconcileOption{`
`494`	`494`	`boxcutter.WithPreviousOwners(previousObjs),`
`495`	`495`	`boxcutter.WithProbe(boxcutter.ProgressProbeType, progressionProbes),`
	`496`	`+ boxcutter.WithAggregatePhaseReconcileErrors(),`
`496`	`497`	`}`
`497`	`498`
`498`	`499`	`phases := make([]boxcutter.Phase, 0)`