Merge pull request #129 from projectsyn/fix/deadlock-error-reporting

Fix error response after operator deadlock resolution
projectsyn · Jul 13, 2023 · 0753527 · 0753527
2 parents 29bfc0f + 0c47ca1
commit 0753527
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/pkg/argocd/argocd.go b/pkg/argocd/argocd.go
@@ -68,7 +68,10 @@ func Apply(ctx context.Context, config *rest.Config, namespace, operatorNamespac
 	if err == nil && len(argos.Items) > 0 {
 		// An ArgoCD custom resource exists in our namespace
 		err = fixArgoOperatorDeadlock(ctx, clientset, config, namespace, operatorNamespace)
-		return fmt.Errorf("could not fix argocd operator deadlock: %w", err)
+		if err != nil {
+			return fmt.Errorf("could not fix argocd operator deadlock: %w", err)
+		}
+		return nil
 	}
 
 	deployments, err := clientset.AppsV1().Deployments(namespace).List(ctx, metav1.ListOptions{