fix: make sure to delay reconcile on all failures (#44)

diranged · Nov 29, 2022 · 1d4e6ac · 1d4e6ac
1 parent de38393
commit 1d4e6ac
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/controllers/exec_access_template_controller.go b/controllers/exec_access_template_controller.go
@@ -81,13 +81,17 @@ func (r *ExecAccessTemplateReconciler) Reconcile(
 	// VERIFICATION: Make sure that the TargetRef is valid and points to an active controller
 	err = r.VerifyTargetRef(builder)
 	if err != nil {
-		return ctrl.Result{}, err
+		return ctrl.Result{
+			RequeueAfter: time.Duration(time.Duration(ErrorReconciliationInterval) * time.Second),
+		}, err
 	}
 
 	// VERIFICATION: Make sure the DefaultDuration and MaxDuration settings are valid
 	err = r.VerifyMiscSettings(builder)
 	if err != nil {
-		return ctrl.Result{}, err
+		return ctrl.Result{
+			RequeueAfter: time.Duration(time.Duration(ErrorReconciliationInterval) * time.Second),
+		}, err
 	}
 
 	// TODO:
@@ -96,7 +100,9 @@ func (r *ExecAccessTemplateReconciler) Reconcile(
 	// FINAL: Set Status.Ready state
 	err = r.setReadyStatus(ctx, resource)
 	if err != nil {
-		return ctrl.Result{}, err
+		return ctrl.Result{
+			RequeueAfter: time.Duration(time.Duration(ErrorReconciliationInterval) * time.Second),
+		}, err
 	}
 	return ctrl.Result{
 		RequeueAfter: time.Duration(r.ReconcililationInterval * int(time.Minute)),

diff --git a/controllers/pod_access_request_controller.go b/controllers/pod_access_request_controller.go
@@ -113,7 +113,9 @@ func (r *PodAccessRequestReconciler) Reconcile(
 	// VERIFICATION: Verifies the requested duration
 	err = r.verifyDuration(builder)
 	if err != nil {
-		return ctrl.Result{}, err
+		return ctrl.Result{
+			RequeueAfter: time.Duration(time.Duration(ErrorReconciliationInterval) * time.Second),
+		}, err
 	}
 
 	// VERIFICATION: Handle whether or not the access is expired at this point! If so, delete it.
@@ -143,7 +145,9 @@ func (r *PodAccessRequestReconciler) Reconcile(
 	// FINAL: Set Status.Ready state
 	err = r.setReadyStatus(ctx, resource)
 	if err != nil {
-		return ctrl.Result{}, err
+		return ctrl.Result{
+			RequeueAfter: time.Duration(time.Duration(ErrorReconciliationInterval) * time.Second),
+		}, err
 	}
 
 	// Exit Reconciliation Loop

diff --git a/controllers/pod_access_template_controller.go b/controllers/pod_access_template_controller.go
@@ -81,13 +81,17 @@ func (r *PodAccessTemplateReconciler) Reconcile(
 	// VERIFICATION: Make sure that the TargetRef is valid and points to an active controller
 	err = r.VerifyTargetRef(builder)
 	if err != nil {
-		return ctrl.Result{}, err
+		return ctrl.Result{
+			RequeueAfter: time.Duration(time.Duration(ErrorReconciliationInterval) * time.Second),
+		}, err
 	}
 
 	// VERIFICATION: Make sure the DefaultDuration and MaxDuration settings are valid
 	err = r.VerifyMiscSettings(builder)
 	if err != nil {
-		return ctrl.Result{}, err
+		return ctrl.Result{
+			RequeueAfter: time.Duration(time.Duration(ErrorReconciliationInterval) * time.Second),
+		}, err
 	}
 
 	// // TODO:
@@ -96,7 +100,9 @@ func (r *PodAccessTemplateReconciler) Reconcile(
 	// FINAL: Set Status.Ready state
 	err = r.setReadyStatus(ctx, resource)
 	if err != nil {
-		return ctrl.Result{}, err
+		return ctrl.Result{
+			RequeueAfter: time.Duration(time.Duration(ErrorReconciliationInterval) * time.Second),
+		}, err
 	}
 	return ctrl.Result{
 		RequeueAfter: time.Duration(r.ReconcililationInterval * int(time.Minute)),