updates for 1.4 compat

Signed-off-by: Wesley Hayutin <[email protected]>

Author: weshayutin

internal/controller/nonadminbackup_controller.go

@@ -34,6 +34,7 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/util/retry"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -194,7 +195,7 @@ func (r *NonAdminBackupReconciler) setStatusAndConditionForDeletionAndCallDelete
 		},
 	)
 	if updatedPhase || updatedCondition {
-		if err := r.Status().Update(ctx, nab); err != nil {
+		if err := r.updateStatusWithRetry(ctx, logger, nab); err != nil {
 			logger.Error(err, statusUpdateError)
 			return false, err
 		}
@@ -238,7 +239,7 @@ func (r *NonAdminBackupReconciler) setStatusForDirectKubernetesAPIDeletion(ctx c
 		},
 	)
 	if updatedPhase || updatedCondition {
-		if err := r.Status().Update(ctx, nab); err != nil {
+		if err := r.updateStatusWithRetry(ctx, logger, nab); err != nil {
 			logger.Error(err, statusUpdateError)
 			return false, err
 		}
@@ -490,7 +491,7 @@ func (r *NonAdminBackupReconciler) initNabCreate(ctx context.Context, logger log
 
 	// Set phase to New
 	if updated := updateNonAdminPhase(&nab.Status.Phase, nacv1alpha1.NonAdminPhaseNew); updated {
-		if err := r.Status().Update(ctx, nab); err != nil {
+		if err := r.updateStatusWithRetry(ctx, logger, nab); err != nil {
 			logger.Error(err, statusUpdateError)
 			return false, err
 		}
@@ -548,7 +549,7 @@ func (r *NonAdminBackupReconciler) validateSpec(ctx context.Context, logger logr
 		},
 	)
 	if updated {
-		if err := r.Status().Update(ctx, nab); err != nil {
+		if err := r.updateStatusWithRetry(ctx, logger, nab); err != nil {
 			logger.Error(err, statusUpdateError)
 			return false, err
 		}
@@ -590,7 +591,7 @@ func (r *NonAdminBackupReconciler) setBackupUUIDInStatus(ctx context.Context, lo
 			Namespace: r.OADPNamespace,
 			Name:      veleroBackupNACUUID,
 		}
-		if err := r.Status().Update(ctx, nab); err != nil {
+		if err := r.updateStatusWithRetry(ctx, logger, nab); err != nil {
 			logger.Error(err, statusUpdateError)
 			return false, err
 		}
@@ -663,7 +664,7 @@ func (r *NonAdminBackupReconciler) createVeleroBackupAndSyncWithNonAdminBackup(c
 				},
 			)
 			if updatedPhase || updatedCondition {
-				if updateErr := r.Status().Update(ctx, nab); updateErr != nil {
+				if updateErr := r.updateStatusWithRetry(ctx, logger, nab); updateErr != nil {
 					logger.Error(updateErr, nonAdminRestoreStatusUpdateFailureMessage)
 					return false, updateErr
 				}
@@ -798,7 +799,7 @@ func (r *NonAdminBackupReconciler) createVeleroBackupAndSyncWithNonAdminBackup(c
 	updatedDataUploadStatus := updateNonAdminBackupDataUploadStatus(&nab.Status, dataUploads)
 
 	if updated || updatedPhase || updatedCondition || updatedQueueInfo || updatedPodVolumeBackupStatus || updatedDataUploadStatus {
-		if err := r.Status().Update(ctx, nab); err != nil {
+		if err := r.updateStatusWithRetry(ctx, logger, nab); err != nil {
 			logger.Error(err, statusUpdateError)
 			return false, err
 		}
@@ -810,6 +811,29 @@ func (r *NonAdminBackupReconciler) createVeleroBackupAndSyncWithNonAdminBackup(c
 	return false, nil
 }
 
+// updateStatusWithRetry updates the NonAdminBackup status with retry logic to handle resource version conflicts
+func (r *NonAdminBackupReconciler) updateStatusWithRetry(ctx context.Context, logger logr.Logger, nab *nacv1alpha1.NonAdminBackup) error {
+	return retry.RetryOnConflict(retry.DefaultBackoff, func() error {
+		// Always fetch the latest version before updating status
+		current := &nacv1alpha1.NonAdminBackup{}
+		if err := r.Get(ctx, client.ObjectKeyFromObject(nab), current); err != nil {
+			return err
+		}
+
+		// Copy the status we want to update to the latest version
+		current.Status = nab.Status
+
+		// Attempt status update on fresh resource version
+		if err := r.Status().Update(ctx, current); err != nil {
+			logger.V(1).Info("Status update conflict, retrying...", "error", err.Error())
+			return err
+		}
+
+		logger.V(1).Info("Status update successful")
+		return nil
+	})
+}
+
 // SetupWithManager sets up the controller with the Manager.
 func (r *NonAdminBackupReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).