fix rollout stuck in Progressing

Signed-off-by: joey <[email protected]>
argoproj · Jan 25, 2025 · 449365b · 449365b
1 parent c10bf66
commit 449365b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/rollout/bluegreen_test.go b/rollout/bluegreen_test.go
@@ -1406,6 +1406,7 @@ func TestBlueGreenReadyToScaleDownOldReplica(t *testing.T) {
 	f.objects = append(f.objects, r2)
 	f.serviceLister = append(f.serviceLister, s)
 
+	f.expectPatchReplicaSetAction(rs2)
 	updatedRSIndex := f.expectUpdateReplicaSetAction(rs2)
 	patchIndex := f.expectPatchRolloutAction(r2)
 	f.run(getKey(r2, t))

diff --git a/rollout/replicaset.go b/rollout/replicaset.go
@@ -107,6 +107,16 @@ func (c *rolloutContext) removeScaleDownDeadlines() error {
 			toRemove = append(toRemove, c.stableRS)
 		}
 	}
+	for _, rs := range c.otherRSs {
+		remainScaleDownDeadlines, err := replicasetutil.GetTimeRemainingBeforeScaleDownDeadline(rs)
+		if err != nil {
+			c.log.Warnf("%v", err)
+			continue
+		}
+		if replicasetutil.HasScaleDownDeadline(rs) && remainScaleDownDeadlines == nil {
+			toRemove = append(toRemove, rs)
+		}
+	}
 	for _, rs := range toRemove {
 		err := c.removeScaleDownDelay(rs)
 		if err != nil {