Merge pull request #34 from kitagry/fix-controllers

don't return both non-nil result and non-nil error
kitagry · Aug 21, 2024 · 1ce774e · 1ce774e
2 parents fe72e0c + 5433875
commit 1ce774e
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/controllers/berglassecret_controller.go b/controllers/berglassecret_controller.go
@@ -64,9 +64,6 @@ func (r *BerglasSecretReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
-	result := ctrl.Result{
-		RequeueAfter: getOrDefault(berglasSecret.Spec.RefreshInterval, metav1.Duration{Duration: defaultRefreshInterval}).Duration,
-	}
 	if err := r.reconcileSecret(ctx, req, &berglasSecret); err != nil {
 		logger.Error(err, "failed to reconcile secret")
 		setCondition(&berglasSecret.Status, batchv1alpha1.BerglasSecretCondition{
@@ -79,7 +76,7 @@ func (r *BerglasSecretReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		if stErr != nil {
 			logger.Error(err, "failed to update status")
 		}
-		return result, err
+		return ctrl.Result{}, err
 	}
 
 	setCondition(&berglasSecret.Status, batchv1alpha1.BerglasSecretCondition{
@@ -89,11 +86,13 @@ func (r *BerglasSecretReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 	err := r.Status().Update(ctx, &berglasSecret)
 	if err != nil {
 		logger.Error(err, "failed to update status")
-		return result, err
+		return ctrl.Result{}, err
 	}
 
 	logger.Info("success to reconcile")
-	return result, nil
+	return ctrl.Result{
+		RequeueAfter: getOrDefault(berglasSecret.Spec.RefreshInterval, metav1.Duration{Duration: defaultRefreshInterval}).Duration,
+	}, nil
 }
 
 func (r *BerglasSecretReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error {