fix: return either non-nil result or non-nil err; move crds from template/ to crds/ (#55)

ggkhrmv · web-flow · commit 847eb1f27b0f · 2025-10-21T16:26:04.000+02:00
Signed-off-by: Georgy Khromov &lt;gg.khrmv@gmail.com&gt;
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -70,7 +70,9 @@ tasks:
     desc: Generate code
     deps:
       - controller-gen
-    cmd: '{{ .CONTROLLER_GEN }} object:headerFile="hack/boilerplate.go.txt" paths="./..."'
+    cmds: 
+      - '{{ .CONTROLLER_GEN }} object:headerFile="hack/boilerplate.go.txt" paths="./..."'
+      - cp -r config/crd/bases/ helm/argocd-rbac-operator/crds
 
   fmt:
     desc: Format code
diff --git a/helm/argocd-rbac-operator/crds/rbac-operator.argoproj-labs.io_argocdprojectrolebindings.yaml b/helm/argocd-rbac-operator/crds/rbac-operator.argoproj-labs.io_argocdprojectrolebindings.yaml
diff --git a/helm/argocd-rbac-operator/crds/rbac-operator.argoproj-labs.io_argocdprojectroles.yaml b/helm/argocd-rbac-operator/crds/rbac-operator.argoproj-labs.io_argocdprojectroles.yaml
@@ -58,6 +58,7 @@ spec:
                       enum:
                       - clusters
                       - applications
+                      - applicationsets
                       - repositories
                       - logs
                       - exec
diff --git a/helm/argocd-rbac-operator/crds/rbac-operator.argoproj-labs.io_argocdrolebindings.yaml b/helm/argocd-rbac-operator/crds/rbac-operator.argoproj-labs.io_argocdrolebindings.yaml
@@ -72,6 +72,7 @@ spec:
                 type: array
             required:
             - argocdRoleRef
+            - subjects
             type: object
           status:
             description: ArgoCDRoleBindingStatus defines the observed state of ArgoCDRoleBinding
diff --git a/helm/argocd-rbac-operator/crds/rbac-operator.argoproj-labs.io_argocdroles.yaml b/helm/argocd-rbac-operator/crds/rbac-operator.argoproj-labs.io_argocdroles.yaml
diff --git a/internal/controller/argocdprojectrole_controller.go b/internal/controller/argocdprojectrole_controller.go
@@ -60,7 +60,7 @@ func (r *ArgoCDProjectRoleReconciler) Reconcile(ctx context.Context, req ctrl.Re
 		if err := r.Status().Update(ctx, &projectRole); err != nil {
 			r.Log.Error(err, "Failed to update ArgoCDProjectRole status", "name", req.Name)
 		}
-		return ctrl.Result{RequeueAfter: time.Minute * 2}, err
+		return ctrl.Result{}, err
 	}
 
 	if projectRole.IsBeingDeleted() {
@@ -69,7 +69,7 @@ func (r *ArgoCDProjectRoleReconciler) Reconcile(ctx context.Context, req ctrl.Re
 			if err := r.Status().Update(ctx, &projectRole); err != nil {
 				r.Log.Error(err, "Failed to update ArgoCDProjectRole status during finalizer handling", "name", req.Name)
 			}
-			return ctrl.Result{RequeueAfter: time.Minute * 2}, fmt.Errorf("error when handling finalizer: %v", err)
+			return ctrl.Result{}, fmt.Errorf("error when handling finalizer: %v", err)
 		}
 		return ctrl.Result{}, nil
 	}
@@ -80,7 +80,7 @@ func (r *ArgoCDProjectRoleReconciler) Reconcile(ctx context.Context, req ctrl.Re
 			if err := r.Status().Update(ctx, &projectRole); err != nil {
 				r.Log.Error(err, "Failed to update ArgoCDProjectRole status after adding finalizer", "name", req.Name)
 			}
-			return ctrl.Result{RequeueAfter: time.Minute * 2}, fmt.Errorf("error when adding finalizer: %v", err)
+			return ctrl.Result{}, fmt.Errorf("error when adding finalizer: %v", err)
 		}
 		return ctrl.Result{RequeueAfter: time.Second}, nil
 	}
@@ -107,7 +107,7 @@ func (r *ArgoCDProjectRoleReconciler) Reconcile(ctx context.Context, req ctrl.Re
 			if err := r.Status().Update(ctx, &projectRole); err != nil {
 				r.Log.Error(err, "Failed to update ArgoCDProjectRole status", "name", req.Name)
 			}
-			return ctrl.Result{RequeueAfter: time.Minute * 2}, fmt.Errorf("error fetching ArgoCDProjectRoleBinding: %v", err)
+			return ctrl.Result{}, fmt.Errorf("error fetching ArgoCDProjectRoleBinding: %v", err)
 		}
 	}
 	return ctrl.Result{RequeueAfter: time.Minute * 5}, nil
diff --git a/internal/controller/argocdprojectrolebinding_controller.go b/internal/controller/argocdprojectrolebinding_controller.go
@@ -61,7 +61,7 @@ func (r *ArgoCDProjectRoleBindingReconciler) Reconcile(ctx context.Context, req
 		projectRoleBinding.SetConditions(rbacoperatorv1alpha1.ReconcileError(err))
 		if err := r.Status().Update(ctx, &projectRoleBinding); err != nil {
 			r.Log.Error(err, "Failed to update ArgoCDProjectRoleBinding status", "name", req.Name)
-			return ctrl.Result{RequeueAfter: time.Minute * 2}, err
+			return ctrl.Result{}, err
 		}
 	}
 
@@ -71,7 +71,7 @@ func (r *ArgoCDProjectRoleBindingReconciler) Reconcile(ctx context.Context, req
 			if err := r.Status().Update(ctx, &projectRoleBinding); err != nil {
 				r.Log.Error(err, "Failed to update ArgoCDProjectRoleBinding status during finalizer handling", "name", req.Name)
 			}
-			return ctrl.Result{RequeueAfter: time.Minute * 2}, fmt.Errorf("error when handling finalizer: %v", err)
+			return ctrl.Result{}, fmt.Errorf("error when handling finalizer: %v", err)
 		}
 		return ctrl.Result{}, nil
 	}
@@ -82,7 +82,7 @@ func (r *ArgoCDProjectRoleBindingReconciler) Reconcile(ctx context.Context, req
 			if err := r.Status().Update(ctx, &projectRoleBinding); err != nil {
 				r.Log.Error(err, "Failed to update ArgoCDProjectRoleBinding status after adding finalizer", "name", req.Name)
 			}
-			return ctrl.Result{RequeueAfter: time.Minute * 2}, fmt.Errorf("error when adding finalizer: %v", err)
+			return ctrl.Result{}, fmt.Errorf("error when adding finalizer: %v", err)
 		}
 		return ctrl.Result{RequeueAfter: time.Second}, nil
 	}
@@ -106,7 +106,7 @@ func (r *ArgoCDProjectRoleBindingReconciler) Reconcile(ctx context.Context, req
 		if err := r.Status().Update(ctx, &projectRoleBinding); err != nil {
 			r.Log.Error(err, "Failed to update ArgoCDProjectRoleBinding status after project role not found", "name", req.Name)
 		}
-		return ctrl.Result{RequeueAfter: time.Minute * 2}, fmt.Errorf("error when getting ArgoCDProjectRole: %v", err)
+		return ctrl.Result{}, fmt.Errorf("error when getting ArgoCDProjectRole: %v", err)
 	}
 
 	if !projectRole.HasArgoCDProjectRoleBindingRef() {
@@ -132,7 +132,7 @@ func (r *ArgoCDProjectRoleBindingReconciler) Reconcile(ctx context.Context, req
 				}
 				r.Log.Error(err, "Failed to remove role from AppProject", "appProject", boundAppProject, "role", projectRoleName)
 				projectRoleBinding.SetConditions(rbacoperatorv1alpha1.ReconcileError(err))
-				return ctrl.Result{RequeueAfter: time.Second}, fmt.Errorf("error when removing role from AppProject: %v", err)
+				return ctrl.Result{}, fmt.Errorf("error when removing role from AppProject: %v", err)
 			}
 			r.Log.Info("Role removed from AppProject", "appProject", boundAppProject, "role", projectRoleName)
 			projectRoleBinding.Status.AppProjectsBound = removeStringFromSlice(projectRoleBinding.Status.AppProjectsBound, boundAppProject)
@@ -163,15 +163,15 @@ func (r *ArgoCDProjectRoleBindingReconciler) Reconcile(ctx context.Context, req
 			if err := r.Status().Update(ctx, &projectRoleBinding); err != nil {
 				r.Log.Error(err, "Failed to update ArgoCDProjectRoleBinding status after patching AppProject", "name", req.Name)
 			}
-			return ctrl.Result{RequeueAfter: time.Second}, fmt.Errorf("error when patching AppProject: %v", err)
+			return ctrl.Result{}, fmt.Errorf("error when patching AppProject: %v", err)
 		}
 		r.Log.Info("AppProject patched successfully", "appProject", appProjectRef)
 		if !isAppProjectInStatus(projectRoleBinding.Status.AppProjectsBound, appProjectRef) {
 			projectRoleBinding.Status.AppProjectsBound = append(projectRoleBinding.Status.AppProjectsBound, appProjectRef)
 			r.Log.Info("AppProject added to status", "appProject", appProjectRef)
 			if err := r.Status().Update(ctx, &projectRoleBinding); err != nil {
 				r.Log.Error(err, "Failed to update ArgoCDProjectRoleBinding status after patching AppProject", "name", req.Name)
-				return ctrl.Result{RequeueAfter: time.Second}, fmt.Errorf("error when updating status: %v", err)
+				return ctrl.Result{}, fmt.Errorf("error when updating status: %v", err)
 			}
 		}
 	}
diff --git a/internal/controller/argocdrole_controller.go b/internal/controller/argocdrole_controller.go
@@ -104,7 +104,7 @@ func (r *ArgoCDRoleReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		if err := r.Client.Status().Update(ctx, &role); err != nil {
 			r.Log.Error(err, "Failed to update ArgoCDRole status", "name", req.Name)
 		}
-		return ctrl.Result{Requeue: true, RequeueAfter: time.Second}, fmt.Errorf("ConfigMap not found")
+		return ctrl.Result{}, fmt.Errorf("ConfigMap not found")
 	}
 
 	if role.HasArgoCDRoleBindingRef() {
@@ -131,7 +131,7 @@ func (r *ArgoCDRoleReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 			if err := r.Client.Status().Update(ctx, &role); err != nil {
 				r.Log.Error(err, "Failed to update ArgoCDRole status", "name", req.Name)
 			}
-			return ctrl.Result{Requeue: true, RequeueAfter: time.Second}, err
+			return ctrl.Result{}, err
 		}
 
 		role.SetConditions(rbacoperatorv1alpha1.ReconcileSuccess().WithObservedGeneration(role.GetGeneration()))
@@ -151,7 +151,7 @@ func (r *ArgoCDRoleReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		if err := r.Client.Status().Update(ctx, &role); err != nil {
 			r.Log.Error(err, "Failed to update ArgoCDRole status", "name", req.Name)
 		}
-		return ctrl.Result{Requeue: true, RequeueAfter: time.Second}, err
+		return ctrl.Result{}, err
 	}
 
 	role.SetConditions(rbacoperatorv1alpha1.ReconcileSuccess().WithObservedGeneration(role.GetGeneration()))
diff --git a/internal/controller/argocdrole_controller_test.go b/internal/controller/argocdrole_controller_test.go
@@ -150,7 +150,8 @@ func TestArgoCDRoleReconciler_CMNotFound(t *testing.T) {
 
 	res, err := reconciler.Reconcile(context.TODO(), req)
 	assert.Error(t, err)
-	assert.True(t, res.RequeueAfter > 0, "expected requeue after to be greater than 0")
+	assert.False(t, res.Requeue, "requeue should be false when error is returned")
+	assert.Equal(t, time.Duration(0), res.RequeueAfter, "requeue after should be 0 when error is returned")
 }
 
 func TestArgoCDRoleReconciler_HandleFinalizer(t *testing.T) {
diff --git a/internal/controller/argocdrolebinding_controller.go b/internal/controller/argocdrolebinding_controller.go
@@ -102,7 +102,7 @@ func (r *ArgoCDRoleBindingReconciler) Reconcile(ctx context.Context, req ctrl.Re
 		if err := r.Client.Status().Update(ctx, &rb); err != nil {
 			r.Log.Error(err, "Failed to update ArgoCDRoleBinding status", "name", req.Name)
 		}
-		return ctrl.Result{Requeue: true, RequeueAfter: time.Second}, fmt.Errorf("ConfigMap not found")
+		return ctrl.Result{}, fmt.Errorf("ConfigMap not found")
 	}
 
 	roleName := rb.Spec.ArgoCDRoleRef.Name
@@ -132,7 +132,7 @@ func (r *ArgoCDRoleBindingReconciler) Reconcile(ctx context.Context, req ctrl.Re
 			if err := r.Client.Status().Update(ctx, &rb); err != nil {
 				r.Log.Error(err, "Failed to update ArgoCDRoleBinding status", "name", req.Name)
 			}
-			return ctrl.Result{Requeue: true, RequeueAfter: time.Second}, err
+			return ctrl.Result{}, err
 		}
 
 		if !role.HasArgoCDRoleBindingRef() {
@@ -169,7 +169,7 @@ func (r *ArgoCDRoleBindingReconciler) Reconcile(ctx context.Context, req ctrl.Re
 		if err := r.Client.Status().Update(ctx, &rb); err != nil {
 			r.Log.Error(err, "Failed to update ArgoCDRoleBinding status", "name", req.Name)
 		}
-		return ctrl.Result{Requeue: true, RequeueAfter: time.Second}, err
+		return ctrl.Result{}, err
 	}
 
 	rb.SetConditions(rbacoperatorv1alpha1.ReconcileSuccess().WithObservedGeneration(rb.GetGeneration()))
diff --git a/internal/controller/argocdrolebinding_controller_test.go b/internal/controller/argocdrolebinding_controller_test.go
@@ -152,7 +152,8 @@ func TestArgoCDRoleBindingReconciler_CMNotFound(t *testing.T) {
 
 	res, err := reconciler.Reconcile(context.TODO(), req)
 	assert.Error(t, err)
-	assert.True(t, res.RequeueAfter > 0, "expected requeue after to be greater than 0")
+	assert.False(t, res.Requeue, "requeue should be false when error is returned")
+	assert.Equal(t, time.Duration(0), res.RequeueAfter, "requeue after should be 0 when error is returned")
 }
 
 func TestArgoCDRoleBindingReconciler_HandleFinalizer(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ func (r *ArgoCDProjectRoleReconciler) Reconcile(ctx context.Context, req ctrl.Re`
`60`	`60`	`if err := r.Status().Update(ctx, &projectRole); err != nil {`
`61`	`61`	`r.Log.Error(err, "Failed to update ArgoCDProjectRole status", "name", req.Name)`
`62`	`62`	`}`
`63`		`- return ctrl.Result{RequeueAfter: time.Minute * 2}, err`
	`63`	`+ return ctrl.Result{}, err`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`if projectRole.IsBeingDeleted() {`
`@@ -69,7 +69,7 @@ func (r *ArgoCDProjectRoleReconciler) Reconcile(ctx context.Context, req ctrl.Re`
`69`	`69`	`if err := r.Status().Update(ctx, &projectRole); err != nil {`
`70`	`70`	`r.Log.Error(err, "Failed to update ArgoCDProjectRole status during finalizer handling", "name", req.Name)`
`71`	`71`	`}`
`72`		`- return ctrl.Result{RequeueAfter: time.Minute * 2}, fmt.Errorf("error when handling finalizer: %v", err)`
	`72`	`+ return ctrl.Result{}, fmt.Errorf("error when handling finalizer: %v", err)`
`73`	`73`	`}`
`74`	`74`	`return ctrl.Result{}, nil`
`75`	`75`	`}`
`@@ -80,7 +80,7 @@ func (r *ArgoCDProjectRoleReconciler) Reconcile(ctx context.Context, req ctrl.Re`
`80`	`80`	`if err := r.Status().Update(ctx, &projectRole); err != nil {`
`81`	`81`	`r.Log.Error(err, "Failed to update ArgoCDProjectRole status after adding finalizer", "name", req.Name)`
`82`	`82`	`}`
`83`		`- return ctrl.Result{RequeueAfter: time.Minute * 2}, fmt.Errorf("error when adding finalizer: %v", err)`
	`83`	`+ return ctrl.Result{}, fmt.Errorf("error when adding finalizer: %v", err)`
`84`	`84`	`}`
`85`	`85`	`return ctrl.Result{RequeueAfter: time.Second}, nil`
`86`	`86`	`}`
`@@ -107,7 +107,7 @@ func (r *ArgoCDProjectRoleReconciler) Reconcile(ctx context.Context, req ctrl.Re`
`107`	`107`	`if err := r.Status().Update(ctx, &projectRole); err != nil {`
`108`	`108`	`r.Log.Error(err, "Failed to update ArgoCDProjectRole status", "name", req.Name)`
`109`	`109`	`}`
`110`		`- return ctrl.Result{RequeueAfter: time.Minute * 2}, fmt.Errorf("error fetching ArgoCDProjectRoleBinding: %v", err)`
	`110`	`+ return ctrl.Result{}, fmt.Errorf("error fetching ArgoCDProjectRoleBinding: %v", err)`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`	`return ctrl.Result{RequeueAfter: time.Minute * 5}, nil`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ func (r *ArgoCDProjectRoleBindingReconciler) Reconcile(ctx context.Context, req`
`61`	`61`	`projectRoleBinding.SetConditions(rbacoperatorv1alpha1.ReconcileError(err))`
`62`	`62`	`if err := r.Status().Update(ctx, &projectRoleBinding); err != nil {`
`63`	`63`	`r.Log.Error(err, "Failed to update ArgoCDProjectRoleBinding status", "name", req.Name)`
`64`		`- return ctrl.Result{RequeueAfter: time.Minute * 2}, err`
	`64`	`+ return ctrl.Result{}, err`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
`@@ -71,7 +71,7 @@ func (r *ArgoCDProjectRoleBindingReconciler) Reconcile(ctx context.Context, req`
`71`	`71`	`if err := r.Status().Update(ctx, &projectRoleBinding); err != nil {`
`72`	`72`	`r.Log.Error(err, "Failed to update ArgoCDProjectRoleBinding status during finalizer handling", "name", req.Name)`
`73`	`73`	`}`
`74`		`- return ctrl.Result{RequeueAfter: time.Minute * 2}, fmt.Errorf("error when handling finalizer: %v", err)`
	`74`	`+ return ctrl.Result{}, fmt.Errorf("error when handling finalizer: %v", err)`
`75`	`75`	`}`
`76`	`76`	`return ctrl.Result{}, nil`
`77`	`77`	`}`
`@@ -82,7 +82,7 @@ func (r *ArgoCDProjectRoleBindingReconciler) Reconcile(ctx context.Context, req`
`82`	`82`	`if err := r.Status().Update(ctx, &projectRoleBinding); err != nil {`
`83`	`83`	`r.Log.Error(err, "Failed to update ArgoCDProjectRoleBinding status after adding finalizer", "name", req.Name)`
`84`	`84`	`}`
`85`		`- return ctrl.Result{RequeueAfter: time.Minute * 2}, fmt.Errorf("error when adding finalizer: %v", err)`
	`85`	`+ return ctrl.Result{}, fmt.Errorf("error when adding finalizer: %v", err)`
`86`	`86`	`}`
`87`	`87`	`return ctrl.Result{RequeueAfter: time.Second}, nil`
`88`	`88`	`}`
`@@ -106,7 +106,7 @@ func (r *ArgoCDProjectRoleBindingReconciler) Reconcile(ctx context.Context, req`
`106`	`106`	`if err := r.Status().Update(ctx, &projectRoleBinding); err != nil {`
`107`	`107`	`r.Log.Error(err, "Failed to update ArgoCDProjectRoleBinding status after project role not found", "name", req.Name)`
`108`	`108`	`}`
`109`		`- return ctrl.Result{RequeueAfter: time.Minute * 2}, fmt.Errorf("error when getting ArgoCDProjectRole: %v", err)`
	`109`	`+ return ctrl.Result{}, fmt.Errorf("error when getting ArgoCDProjectRole: %v", err)`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`if !projectRole.HasArgoCDProjectRoleBindingRef() {`
`@@ -132,7 +132,7 @@ func (r *ArgoCDProjectRoleBindingReconciler) Reconcile(ctx context.Context, req`
`132`	`132`	`}`
`133`	`133`	`r.Log.Error(err, "Failed to remove role from AppProject", "appProject", boundAppProject, "role", projectRoleName)`
`134`	`134`	`projectRoleBinding.SetConditions(rbacoperatorv1alpha1.ReconcileError(err))`
`135`		`- return ctrl.Result{RequeueAfter: time.Second}, fmt.Errorf("error when removing role from AppProject: %v", err)`
	`135`	`+ return ctrl.Result{}, fmt.Errorf("error when removing role from AppProject: %v", err)`
`136`	`136`	`}`
`137`	`137`	`r.Log.Info("Role removed from AppProject", "appProject", boundAppProject, "role", projectRoleName)`
`138`	`138`	`projectRoleBinding.Status.AppProjectsBound = removeStringFromSlice(projectRoleBinding.Status.AppProjectsBound, boundAppProject)`
`@@ -163,15 +163,15 @@ func (r *ArgoCDProjectRoleBindingReconciler) Reconcile(ctx context.Context, req`
`163`	`163`	`if err := r.Status().Update(ctx, &projectRoleBinding); err != nil {`
`164`	`164`	`r.Log.Error(err, "Failed to update ArgoCDProjectRoleBinding status after patching AppProject", "name", req.Name)`
`165`	`165`	`}`
`166`		`- return ctrl.Result{RequeueAfter: time.Second}, fmt.Errorf("error when patching AppProject: %v", err)`
	`166`	`+ return ctrl.Result{}, fmt.Errorf("error when patching AppProject: %v", err)`
`167`	`167`	`}`
`168`	`168`	`r.Log.Info("AppProject patched successfully", "appProject", appProjectRef)`
`169`	`169`	`if !isAppProjectInStatus(projectRoleBinding.Status.AppProjectsBound, appProjectRef) {`
`170`	`170`	`projectRoleBinding.Status.AppProjectsBound = append(projectRoleBinding.Status.AppProjectsBound, appProjectRef)`
`171`	`171`	`r.Log.Info("AppProject added to status", "appProject", appProjectRef)`
`172`	`172`	`if err := r.Status().Update(ctx, &projectRoleBinding); err != nil {`
`173`	`173`	`r.Log.Error(err, "Failed to update ArgoCDProjectRoleBinding status after patching AppProject", "name", req.Name)`
`174`		`- return ctrl.Result{RequeueAfter: time.Second}, fmt.Errorf("error when updating status: %v", err)`
	`174`	`+ return ctrl.Result{}, fmt.Errorf("error when updating status: %v", err)`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ func (r *ArgoCDRoleReconciler) Reconcile(ctx context.Context, req ctrl.Request)`
`104`	`104`	`if err := r.Client.Status().Update(ctx, &role); err != nil {`
`105`	`105`	`r.Log.Error(err, "Failed to update ArgoCDRole status", "name", req.Name)`
`106`	`106`	`}`
`107`		`- return ctrl.Result{Requeue: true, RequeueAfter: time.Second}, fmt.Errorf("ConfigMap not found")`
	`107`	`+ return ctrl.Result{}, fmt.Errorf("ConfigMap not found")`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`if role.HasArgoCDRoleBindingRef() {`
`@@ -131,7 +131,7 @@ func (r *ArgoCDRoleReconciler) Reconcile(ctx context.Context, req ctrl.Request)`
`131`	`131`	`if err := r.Client.Status().Update(ctx, &role); err != nil {`
`132`	`132`	`r.Log.Error(err, "Failed to update ArgoCDRole status", "name", req.Name)`
`133`	`133`	`}`
`134`		`- return ctrl.Result{Requeue: true, RequeueAfter: time.Second}, err`
	`134`	`+ return ctrl.Result{}, err`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`role.SetConditions(rbacoperatorv1alpha1.ReconcileSuccess().WithObservedGeneration(role.GetGeneration()))`
`@@ -151,7 +151,7 @@ func (r *ArgoCDRoleReconciler) Reconcile(ctx context.Context, req ctrl.Request)`
`151`	`151`	`if err := r.Client.Status().Update(ctx, &role); err != nil {`
`152`	`152`	`r.Log.Error(err, "Failed to update ArgoCDRole status", "name", req.Name)`
`153`	`153`	`}`
`154`		`- return ctrl.Result{Requeue: true, RequeueAfter: time.Second}, err`
	`154`	`+ return ctrl.Result{}, err`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`role.SetConditions(rbacoperatorv1alpha1.ReconcileSuccess().WithObservedGeneration(role.GetGeneration()))`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,8 @@ func TestArgoCDRoleReconciler_CMNotFound(t *testing.T) {`
`150`	`150`
`151`	`151`	`res, err := reconciler.Reconcile(context.TODO(), req)`
`152`	`152`	`assert.Error(t, err)`
`153`		`- assert.True(t, res.RequeueAfter > 0, "expected requeue after to be greater than 0")`
	`153`	`+ assert.False(t, res.Requeue, "requeue should be false when error is returned")`
	`154`	`+ assert.Equal(t, time.Duration(0), res.RequeueAfter, "requeue after should be 0 when error is returned")`
`154`	`155`	`}`
`155`	`156`
`156`	`157`	`func TestArgoCDRoleReconciler_HandleFinalizer(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ func (r *ArgoCDRoleBindingReconciler) Reconcile(ctx context.Context, req ctrl.Re`
`102`	`102`	`if err := r.Client.Status().Update(ctx, &rb); err != nil {`
`103`	`103`	`r.Log.Error(err, "Failed to update ArgoCDRoleBinding status", "name", req.Name)`
`104`	`104`	`}`
`105`		`- return ctrl.Result{Requeue: true, RequeueAfter: time.Second}, fmt.Errorf("ConfigMap not found")`
	`105`	`+ return ctrl.Result{}, fmt.Errorf("ConfigMap not found")`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`roleName := rb.Spec.ArgoCDRoleRef.Name`
`@@ -132,7 +132,7 @@ func (r *ArgoCDRoleBindingReconciler) Reconcile(ctx context.Context, req ctrl.Re`
`132`	`132`	`if err := r.Client.Status().Update(ctx, &rb); err != nil {`
`133`	`133`	`r.Log.Error(err, "Failed to update ArgoCDRoleBinding status", "name", req.Name)`
`134`	`134`	`}`
`135`		`- return ctrl.Result{Requeue: true, RequeueAfter: time.Second}, err`
	`135`	`+ return ctrl.Result{}, err`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`if !role.HasArgoCDRoleBindingRef() {`
`@@ -169,7 +169,7 @@ func (r *ArgoCDRoleBindingReconciler) Reconcile(ctx context.Context, req ctrl.Re`
`169`	`169`	`if err := r.Client.Status().Update(ctx, &rb); err != nil {`
`170`	`170`	`r.Log.Error(err, "Failed to update ArgoCDRoleBinding status", "name", req.Name)`
`171`	`171`	`}`
`172`		`- return ctrl.Result{Requeue: true, RequeueAfter: time.Second}, err`
	`172`	`+ return ctrl.Result{}, err`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`rb.SetConditions(rbacoperatorv1alpha1.ReconcileSuccess().WithObservedGeneration(rb.GetGeneration()))`