@@ -167,7 +167,7 @@ func (r *RolloutHandler[T]) getProgressiveClusters(rolloutStrategy RolloutStrate
167
167
// Perform progressive rollOut for mandatory decision groups first, tolerating no failures
168
168
if len (clusterGroups ) > 0 {
169
169
rolloutResult := progressivePerGroup (
170
- clusterGroups , intstr .FromInt (0 ), minSuccessTime , failureTimeout , currentClusterStatus ,
170
+ clusterGroups , intstr .FromInt32 (0 ), minSuccessTime , failureTimeout , currentClusterStatus ,
171
171
)
172
172
if len (rolloutResult .ClustersToRollout ) > 0 || len (rolloutResult .ClustersTimeOut ) > 0 {
173
173
rolloutResult .ClustersRemoved = removedClusterStatus
@@ -223,7 +223,7 @@ func (r *RolloutHandler[T]) getProgressivePerGroupClusters(rolloutStrategy Rollo
223
223
224
224
// Perform progressive rollout per group for mandatory decision groups first, tolerating no failures
225
225
if len (clusterGroups ) > 0 {
226
- rolloutResult := progressivePerGroup (clusterGroups , intstr .FromInt (0 ), minSuccessTime , failureTimeout , currentClusterStatus )
226
+ rolloutResult := progressivePerGroup (clusterGroups , intstr .FromInt32 (0 ), minSuccessTime , failureTimeout , currentClusterStatus )
227
227
228
228
if len (rolloutResult .ClustersToRollout ) > 0 || len (rolloutResult .ClustersTimeOut ) > 0 {
229
229
rolloutResult .ClustersRemoved = removedClusterStatus
@@ -585,7 +585,7 @@ func parseTimeout(timeoutStr string) (time.Duration, error) {
585
585
}
586
586
587
587
func decisionGroupsToGroupKeys (decisionsGroup []MandatoryDecisionGroup ) []clusterv1beta1.GroupKey {
588
- result := []clusterv1beta1.GroupKey {}
588
+ var result []clusterv1beta1.GroupKey
589
589
for _ , d := range decisionsGroup {
590
590
gk := clusterv1beta1.GroupKey {}
591
591
// GroupName is considered first to select the decisionGroups then GroupIndex.
@@ -609,7 +609,7 @@ func minRecheckAfter(rolloutClusters []ClusterRolloutStatus, minSuccessTime time
609
609
}
610
610
}
611
611
}
612
- if minSuccessTime != 0 && minSuccessTime < * minRecheckAfter {
612
+ if minSuccessTime != 0 && ( minRecheckAfter == nil || minSuccessTime < * minRecheckAfter ) {
613
613
minRecheckAfter = & minSuccessTime
614
614
}
615
615
0 commit comments