Node controller now retries properly

aws · Sep 8, 2021 · 5c8e002 · 5c8e002
1 parent 751cca1
commit 5c8e002
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/pkg/controllers/node/controller.go b/pkg/controllers/node/controller.go
@@ -114,7 +114,7 @@ func (c *Controller) Reconcile(ctx context.Context, req reconcile.Request) (reco
 	if errs != nil {
 		return result.RetryIfError(ctx, errs)
 	}
-	return reconcile.Result{RequeueAfter: functional.MaxDuration(backoffs...)}, nil
+	return reconcile.Result{RequeueAfter: functional.MinDuration(backoffs...)}, nil
 }
 
 func (c *Controller) Register(ctx context.Context, m manager.Manager) error {

diff --git a/pkg/utils/functional/functional.go b/pkg/utils/functional/functional.go
@@ -112,12 +112,12 @@ func InvertStringMap(stringMap map[string]string) map[string]string {
 }
 
 // MaxDuration returns the largest duration
-func MaxDuration(durations ...time.Duration) time.Duration {
-	var max time.Duration
+func MinDuration(durations ...time.Duration) time.Duration {
+	var min time.Duration
 	for _, duration := range durations {
-		if duration > max {
-			max = duration
+		if (duration < min && duration != 0) || (duration != 0 && min == 0) {
+			min = duration
 		}
 	}
-	return max
+	return min
 }