fix: resolve finalizer removal conflict in HelmRepository deletion

- Add removeFinalizerWithRetry method to handle resource version conflicts
- Use retry.RetryOnConflict to safely remove finalizers during deletion
- Get latest resource version before attempting finalizer removal
- Handle NotFound errors gracefully (resource already deleted)

This fixes the StorageError with precondition failed UID mismatch that
occurred when multiple operations tried to modify the same HelmRepository
resource during deletion.

Author: poneding

internal/controller/helmrepository_controller.go

@@ -214,9 +214,8 @@ func (r *HelmRepositoryReconciler) reconcileDelete(ctx context.Context, repo *he
 		// Don't block deletion, just log error
 	}
 
-	// Remove Finalizer
-	controllerutil.RemoveFinalizer(repo, utils.HelmRepositoryFinalizer)
-	if err := r.Update(ctx, repo); err != nil {
+	// Remove Finalizer with retry
+	if err := r.removeFinalizerWithRetry(ctx, repo); err != nil {
 		logger.Error(err, "Failed to remove finalizer")
 		return ctrl.Result{}, err
 	}
@@ -623,6 +622,27 @@ func sanitizeKubernetesName(name string) string {
 	return result
 }
 
+// removeFinalizerWithRetry removes finalizer with retry mechanism to handle conflicts
+func (r *HelmRepositoryReconciler) removeFinalizerWithRetry(ctx context.Context, repo *helmoperatorv1alpha1.HelmRepository) error {
+	return retry.RetryOnConflict(retry.DefaultRetry, func() error {
+		// Get the latest version of the resource
+		latest := &helmoperatorv1alpha1.HelmRepository{}
+		if err := r.Get(ctx, client.ObjectKeyFromObject(repo), latest); err != nil {
+			if apierrors.IsNotFound(err) {
+				// Resource already deleted, consider success
+				return nil
+			}
+			return err
+		}
+
+		// Remove finalizer from the latest version
+		controllerutil.RemoveFinalizer(latest, utils.HelmRepositoryFinalizer)
+		
+		// Update the resource
+		return r.Update(ctx, latest)
+	})
+}
+
 // SetupWithManager sets up the controller with the Manager.
 func (r *HelmRepositoryReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).

internal/helm/client.go

@@ -183,16 +183,16 @@ type UninstallRequest struct {
 
 // ReleaseInfo contains information about a release
 type ReleaseInfo struct {
-	Name          string
-	Namespace     string
-	Revision      int
-	Status        string
-	Chart         string
-	AppVersion    string
-	Updated       time.Time
-	Description   string
-	FirstDeployed *time.Time
-	LastDeployed  *time.Time
+	Name           string
+	Namespace      string
+	Revision       int
+	Status         string
+	Chart          string
+	AppVersion     string
+	Updated        time.Time
+	Description    string
+	FirstDeployed  *time.Time
+	LastDeployed   *time.Time
 	Notes          string
 	Values         string
 	OriginalValues string // Default values from the chart

internal/helm/repository.go

@@ -148,7 +148,8 @@ func (c *helmClient) RemoveRepository(ctx context.Context, name string) error {
 	}
 
 	if !f.Has(name) {
-		return fmt.Errorf("repository %s not found", name)
+		// return fmt.Errorf("repository %s not found", name)
+		return nil // If repository doesn't exist, just return nil to avoid error
 	}
 
 	// Remove repository from file