fix: retry status update on conflict using retry.RetryOnConflict

Author: aabichou

internal/controller/hermesinstance_controller.go

@@ -41,6 +41,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/tools/record"
+	"k8s.io/client-go/util/retry"
 
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -204,14 +205,18 @@ func (r *HermesInstanceReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 
 	r.updateProfileStoreCondition(ctx, inst)
 
-	// Snapshot status before final update to use Patch (avoids conflict with Flux SSA)
-	original := inst.DeepCopy()
-	if err := r.updateStatus(ctx, inst); err != nil {
-		logger.Error(err, "status update failed")
-	} else {
-		if err := r.Status().Patch(ctx, inst, client.MergeFrom(original)); err != nil {
-			logger.Error(err, "status patch failed")
+	// Retry status update on conflict (Flux SSA may modify the CR concurrently).
+	statusErr := retry.RetryOnConflict(retry.DefaultRetry, func() error {
+		if err := r.Get(ctx, types.NamespacedName{Name: inst.Name, Namespace: inst.Namespace}, inst); err != nil {
+			return err
 		}
+		if err := r.updateStatus(ctx, inst); err != nil {
+			return err
+		}
+		return r.Status().Update(ctx, inst)
+	})
+	if statusErr != nil {
+		logger.Error(statusErr, "status update failed")
 	}
 
 	return ctrl.Result{RequeueAfter: 5 * time.Minute}, nil
@@ -1140,7 +1145,7 @@ func (r *HermesInstanceReconciler) updateStatus(ctx context.Context, inst *herme
 		inst.Status.Phase = "Pending"
 		r.setCondition(inst, hermesv1.ConditionTypeReady, metav1.ConditionFalse, "StatefulSetNotReady", "")
 	}
-	return nil  // status computed, caller Patches
+	return r.Status().Update(ctx, inst)
 }
 
 // SetupWithManager wires watches for every owned type.