Avoid repeating max wait duration computation

kubernetes-sigs · May 23, 2024 · ce6ef21 · ce6ef21
1 parent e97917b
commit ce6ef21
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/pkg/controller/core/core.go b/pkg/controller/core/core.go
@@ -85,7 +85,7 @@ func waitForPodsReady(cfg *configapi.WaitForPodsReady) *waitForPodsReadyConfig {
 	if cfg.RequeuingStrategy != nil {
 		result.requeuingBackoffBaseSeconds = *cfg.RequeuingStrategy.BackoffBaseSeconds
 		result.requeuingBackoffLimitCount = cfg.RequeuingStrategy.BackoffLimitCount
-		result.requeuingBackoffMaxSeconds = *cfg.RequeuingStrategy.BackoffMaxSeconds
+		result.requeuingBackoffMaxDuration = time.Duration(*cfg.RequeuingStrategy.BackoffMaxSeconds) * time.Second
 		result.requeuingBackoffJitter = 0.0001
 	}
 	return &result

diff --git a/pkg/controller/core/workload_controller.go b/pkg/controller/core/workload_controller.go
@@ -74,7 +74,7 @@ type waitForPodsReadyConfig struct {
 	timeout                     time.Duration
 	requeuingBackoffLimitCount  *int32
 	requeuingBackoffBaseSeconds int32
-	requeuingBackoffMaxSeconds  int32
+	requeuingBackoffMaxDuration time.Duration
 	requeuingBackoffJitter      float64
 }
 
@@ -468,9 +468,8 @@ func (r *WorkloadReconciler) triggerDeactivationOrBackoffRequeue(ctx context.Con
 		Steps:    int(requeuingCount),
 	}
 	var waitDuration time.Duration
-	maxWaitDuration := time.Duration(r.waitForPodsReady.requeuingBackoffMaxSeconds) * time.Second
-	for backoff.Steps > 0 && waitDuration < maxWaitDuration {
-		waitDuration = min(backoff.Step(), maxWaitDuration)
+	for backoff.Steps > 0 && waitDuration < r.waitForPodsReady.requeuingBackoffMaxDuration {
+		waitDuration = min(backoff.Step(), r.waitForPodsReady.requeuingBackoffMaxDuration)
 	}
 
 	wl.Status.RequeueState.RequeueAt = ptr.To(metav1.NewTime(r.clock.Now().Add(waitDuration)))

diff --git a/pkg/controller/core/workload_controller_test.go b/pkg/controller/core/workload_controller_test.go
@@ -511,7 +511,7 @@ func TestReconcile(t *testing.T) {
 					requeuingBackoffLimitCount:  ptr.To[int32](100),
 					requeuingBackoffBaseSeconds: 10,
 					requeuingBackoffJitter:      0,
-					requeuingBackoffMaxSeconds:  3600,
+					requeuingBackoffMaxDuration: time.Duration(3600) * time.Second,
 				}),
 			},
 			workload: utiltesting.MakeWorkload("wl", "ns").
@@ -598,7 +598,7 @@ func TestReconcile(t *testing.T) {
 					requeuingBackoffLimitCount:  ptr.To[int32](100),
 					requeuingBackoffBaseSeconds: 10,
 					requeuingBackoffJitter:      0,
-					requeuingBackoffMaxSeconds:  7200,
+					requeuingBackoffMaxDuration: time.Duration(7200) * time.Second,
 				}),
 			},
 			workload: utiltesting.MakeWorkload("wl", "ns").