🌱 Calculate requeue time in rollout

cluster/v1alpha1/helpers.go

@@ -65,6 +65,8 @@ type RolloutResult struct {
 	ClustersRemoved []ClusterRolloutStatus
 	// MaxFailureBreach is a boolean signaling whether the rollout was cut short because of failed clusters.
 	MaxFailureBreach bool
+	// RecheckAfter is the time duration to recheck the rollout status.
+	RecheckAfter *time.Duration
 }
 
 // ClusterRolloutStatusFunc defines a function that return the rollout status for a given workload.
@@ -307,6 +309,7 @@ func progressivePerCluster(
 				ClustersToRollout: rolloutClusters,
 				ClustersTimeOut:   timeoutClusters,
 				MaxFailureBreach:  failureBreach,
+				RecheckAfter:      minRecheckAfter(rolloutClusters, minSuccessTime),
 			}
 		}
 	}
@@ -316,6 +319,7 @@ func progressivePerCluster(
 			ClustersToRollout: rolloutClusters,
 			ClustersTimeOut:   timeoutClusters,
 			MaxFailureBreach:  failureBreach,
+			RecheckAfter:      minRecheckAfter(rolloutClusters, minSuccessTime),
 		}
 	}
 
@@ -344,13 +348,15 @@ func progressivePerCluster(
 			return RolloutResult{
 				ClustersToRollout: rolloutClusters,
 				ClustersTimeOut:   timeoutClusters,
+				RecheckAfter:      minRecheckAfter(rolloutClusters, minSuccessTime),
 			}
 		}
 	}
 
 	return RolloutResult{
 		ClustersToRollout: rolloutClusters,
 		ClustersTimeOut:   timeoutClusters,
+		RecheckAfter:      minRecheckAfter(rolloutClusters, minSuccessTime),
 	}
 }
 
@@ -417,6 +423,7 @@ func progressivePerGroup(
 					ClustersToRollout: rolloutClusters,
 					ClustersTimeOut:   timeoutClusters,
 					MaxFailureBreach:  failureBreach,
+					RecheckAfter:      minRecheckAfter(rolloutClusters, minSuccessTime),
 				}
 			}
 		}
@@ -426,6 +433,7 @@ func progressivePerGroup(
 		ClustersToRollout: rolloutClusters,
 		ClustersTimeOut:   timeoutClusters,
 		MaxFailureBreach:  failureBreach,
+		RecheckAfter:      minRecheckAfter(rolloutClusters, minSuccessTime),
 	}
 }
 
@@ -467,7 +475,7 @@ func determineRolloutStatus(
 		timeOutTime := getTimeOutTime(status.LastTransitionTime, timeout)
 		status.TimeOutTime = timeOutTime
 		// check if current time is before the timeout time
-		if RolloutClock.Now().Before(timeOutTime.Time) {
+		if timeOutTime == nil || RolloutClock.Now().Before(timeOutTime.Time) {
 			rolloutClusters = append(rolloutClusters, *status)
 		} else {
 			status.Status = TimeOut
@@ -482,6 +490,10 @@ func determineRolloutStatus(
 // RolloutClock if a start time isn't provided.
 func getTimeOutTime(startTime *metav1.Time, timeout time.Duration) *metav1.Time {
 	var timeoutTime time.Time
+	// if timeout is not set (default to maxTimeDuration), the timeout time should not be set
+	if timeout == maxTimeDuration {
+		return nil
+	}
 	if startTime == nil {
 		timeoutTime = RolloutClock.Now().Add(timeout)
 	} else {
@@ -578,3 +590,20 @@ func decisionGroupsToGroupKeys(decisionsGroup []MandatoryDecisionGroup) []cluste
 	}
 	return result
 }
+
+func minRecheckAfter(rolloutClusters []ClusterRolloutStatus, minSuccessTime time.Duration) *time.Duration {
+	var minRecheckAfter *time.Duration
+	for _, r := range rolloutClusters {
+		if r.TimeOutTime != nil {
+			timeOut := r.TimeOutTime.Sub(RolloutClock.Now())
+			if minRecheckAfter == nil || *minRecheckAfter > timeOut {
+				minRecheckAfter = &timeOut
+			}
+		}
+	}
+	if minSuccessTime != 0 && minSuccessTime < *minRecheckAfter {
+		minRecheckAfter = &minSuccessTime
+	}
+
+	return minRecheckAfter
+}