fix: address coderabbit feedback

Signed-off-by: Christopher Coco <ccoco@redhat.com>

Author: cjcocokrisp

controllers/argocdagent/agent/role.go

@@ -126,6 +126,7 @@ func ReconcileAgentClusterRoles(client client.Client, compName string, cr *argop
 			if err := client.Delete(context.TODO(), clusterRole); err != nil {
 				return clusterRole, fmt.Errorf("failed to delete principal clusterRole %s: %v", clusterRole.Name, err)
 			}
+			return clusterRole, nil
 		}
 
 		if !reflect.DeepEqual(expectedPolicyRule, clusterRole.Rules) {

controllers/argocdagent/agent/rolebinding.go

@@ -140,6 +140,7 @@ func ReconcileAgentClusterRoleBinding(client client.Client, compName string, sa
 			if err := client.Delete(context.TODO(), clusterRoleBinding); err != nil {
 				return fmt.Errorf("failed to delete agent clusterRoleBinding %s: %v", clusterRoleBinding.Name, err)
 			}
+			return nil
 		}
 
 		// Update ClusterRoleBinding if subjects or role ref have changed
@@ -212,8 +213,5 @@ func buildClusterRoleBinding(compName string, cr *argoproj.ArgoCD) *v1.ClusterRo
 }
 
 func getCustomRoleName() string {
-	if name := os.Getenv(common.ArgoCDAgentClusterRoleEnvName); name != "" {
-		return name
-	}
-	return ""
+	return os.Getenv(common.ArgoCDAgentClusterRoleEnvName)
 }

controllers/argocdagent/role.go

@@ -126,6 +126,7 @@ func ReconcilePrincipalClusterRoles(client client.Client, compName string, cr *a
 			if err := client.Delete(context.TODO(), clusterRole); err != nil {
 				return clusterRole, fmt.Errorf("failed to delete principal clusterRole %s: %v", clusterRole.Name, err)
 			}
+			return clusterRole, nil
 		}
 
 		if !reflect.DeepEqual(expectedPolicyRule, clusterRole.Rules) {

controllers/argocdagent/rolebinding.go

@@ -135,6 +135,7 @@ func ReconcilePrincipalClusterRoleBinding(client client.Client, compName string,
 			if err := client.Delete(context.TODO(), clusterRoleBinding); err != nil {
 				return fmt.Errorf("failed to delete principal clusterRoleBinding %s: %v", clusterRoleBinding.Name, err)
 			}
+			return nil
 		}
 
 		if !reflect.DeepEqual(clusterRoleBinding.Subjects, expectedSubjects) ||
@@ -206,8 +207,5 @@ func buildClusterRoleBinding(compName string, cr *argoproj.ArgoCD) *v1.ClusterRo
 }
 
 func getCustomRoleName() string {
-	if name := os.Getenv(common.ArgoCDPrincipalClusterRoleEnvName); name != "" {
-		return name
-	}
-	return ""
+	return os.Getenv(common.ArgoCDPrincipalClusterRoleEnvName)
 }