use subreconciler method to return error

snapp-incubator · Dec 12, 2023 · 7186084 · 7186084
1 parent 71c9964
commit 7186084
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/internal/controller/basic_authenticator/cleanup.go b/internal/controller/basic_authenticator/cleanup.go
@@ -32,7 +32,7 @@ func (r *BasicAuthenticatorReconciler) Cleanup(ctx context.Context, req ctrl.Req
 func (r *BasicAuthenticatorReconciler) setDeletionStatus(ctx context.Context, req ctrl.Request) (*ctrl.Result, error) {
 	basicAuthenticator := &v1alpha1.BasicAuthenticator{}
 	if r, err := r.getLatestBasicAuthenticator(ctx, req, basicAuthenticator); subreconciler.ShouldHaltOrRequeue(r, err) {
-		return r, err
+		return subreconciler.RequeueWithError(err)
 	}
 	basicAuthenticator.Status.State = StatusDeleting
 
@@ -46,7 +46,7 @@ func (r *BasicAuthenticatorReconciler) removeInjectedContainers(ctx context.Cont
 	basicAuthenticator := &v1alpha1.BasicAuthenticator{}
 
 	if r, err := r.getLatestBasicAuthenticator(ctx, req, basicAuthenticator); subreconciler.ShouldHaltOrRequeue(r, err) {
-		return r, err
+		return subreconciler.RequeueWithError(err)
 	}
 
 	if basicAuthenticator.Spec.Type != "sidecar" {
@@ -88,7 +88,7 @@ func (r *BasicAuthenticatorReconciler) removeInjectedContainers(ctx context.Cont
 func (r *BasicAuthenticatorReconciler) removeCleanupFinalizer(ctx context.Context, req ctrl.Request) (*ctrl.Result, error) {
 	basicAuthenticator := &v1alpha1.BasicAuthenticator{}
 	if r, err := r.getLatestBasicAuthenticator(ctx, req, basicAuthenticator); subreconciler.ShouldHaltOrRequeue(r, err) {
-		return r, err
+		return subreconciler.RequeueWithError(err)
 	}
 	if controllerutil.ContainsFinalizer(basicAuthenticator, basicAuthenticatorFinalizer) {
 		if ok := controllerutil.RemoveFinalizer(basicAuthenticator, basicAuthenticatorFinalizer); !ok {

diff --git a/internal/controller/basic_authenticator/provision.go b/internal/controller/basic_authenticator/provision.go
@@ -41,7 +41,7 @@ func (r *BasicAuthenticatorReconciler) setReconcilingStatus(ctx context.Context,
 	basicAuthenticator := &v1alpha1.BasicAuthenticator{}
 
 	if r, err := r.getLatestBasicAuthenticator(ctx, req, basicAuthenticator); subreconciler.ShouldHaltOrRequeue(r, err) {
-		return r, err
+		return subreconciler.RequeueWithError(err)
 	}
 
 	basicAuthenticator.Status.State = StatusReconciling
@@ -56,7 +56,7 @@ func (r *BasicAuthenticatorReconciler) addCleanupFinalizer(ctx context.Context,
 	basicAuthenticator := &v1alpha1.BasicAuthenticator{}
 
 	if r, err := r.getLatestBasicAuthenticator(ctx, req, basicAuthenticator); subreconciler.ShouldHaltOrRequeue(r, err) {
-		return r, err
+		return subreconciler.RequeueWithError(err)
 	}
 	if !controllerutil.ContainsFinalizer(basicAuthenticator, basicAuthenticatorFinalizer) {
 		if objUpdated := controllerutil.AddFinalizer(basicAuthenticator, basicAuthenticatorFinalizer); objUpdated {
@@ -86,7 +86,7 @@ func (r *BasicAuthenticatorReconciler) ensureSecret(ctx context.Context, req ctr
 	basicAuthenticator := &v1alpha1.BasicAuthenticator{}
 
 	if r, err := r.getLatestBasicAuthenticator(ctx, req, basicAuthenticator); subreconciler.ShouldHaltOrRequeue(r, err) {
-		return r, err
+		return subreconciler.RequeueWithError(err)
 	}
 	r.credentialName = basicAuthenticator.Spec.CredentialsSecretRef
 	var credentialSecret corev1.Secret
@@ -153,7 +153,7 @@ func (r *BasicAuthenticatorReconciler) ensureConfigmap(ctx context.Context, req
 	basicAuthenticator := &v1alpha1.BasicAuthenticator{}
 
 	if r, err := r.getLatestBasicAuthenticator(ctx, req, basicAuthenticator); subreconciler.ShouldHaltOrRequeue(r, err) {
-		return r, err
+		return subreconciler.RequeueWithError(err)
 	}
 
 	authenticatorConfig := createNginxConfigmap(basicAuthenticator)
@@ -195,7 +195,7 @@ func (r *BasicAuthenticatorReconciler) ensureDeployment(ctx context.Context, req
 	basicAuthenticator := &v1alpha1.BasicAuthenticator{}
 
 	if r, err := r.getLatestBasicAuthenticator(ctx, req, basicAuthenticator); subreconciler.ShouldHaltOrRequeue(r, err) {
-		return r, err
+		return subreconciler.RequeueWithError(err)
 	}
 
 	if r.configMapName == "" {
@@ -217,7 +217,7 @@ func (r *BasicAuthenticatorReconciler) ensureService(ctx context.Context, req ct
 	basicAuthenticator := &v1alpha1.BasicAuthenticator{}
 
 	if r, err := r.getLatestBasicAuthenticator(ctx, req, basicAuthenticator); subreconciler.ShouldHaltOrRequeue(r, err) {
-		return r, err
+		return subreconciler.RequeueWithError(err)
 	}
 	if r.deploymentLabel == nil {
 		return subreconciler.ContinueReconciling()
@@ -257,7 +257,7 @@ func (r *BasicAuthenticatorReconciler) setAvailableStatus(ctx context.Context, r
 	basicAuthenticator := &v1alpha1.BasicAuthenticator{}
 
 	if r, err := r.getLatestBasicAuthenticator(ctx, req, basicAuthenticator); subreconciler.ShouldHaltOrRequeue(r, err) {
-		return r, err
+		return subreconciler.RequeueWithError(err)
 	}
 
 	basicAuthenticator.Status.State = StatusAvailable