Issue #93 - Cleanup old canary replica sets

argoproj · Jun 11, 2019 · a16fdc2 · a16fdc2
1 parent ae6e277
commit a16fdc2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/controller/bluegreen_test.go b/controller/bluegreen_test.go
@@ -392,8 +392,7 @@ func TestBlueGreenHandlePause(t *testing.T) {
 		f.kubeobjects = append(f.kubeobjects, activeSvc, rs1, rs2)
 		f.rolloutLister = append(f.rolloutLister, r2)
 		f.replicaSetLister = append(f.replicaSetLister, rs1, rs2)
-
-		f.expectGetServiceAction(activeSvc)
+		f.serviceLister = append(f.serviceLister, activeSvc)
 
 		now := metav1.Now().UTC().Format(time.RFC3339)
 		expectedPatchWithoutSubs := `{

diff --git a/controller/canary.go b/controller/canary.go
@@ -47,6 +47,11 @@ func (c *Controller) rolloutCanary(rollout *v1alpha1.Rollout, rsList []*appsv1.R
 		allRSs = append(allRSs, stableRS)
 	}
 
+	logCtx.Info("Cleaning up old replicasets")
+	if err := c.cleanupRollouts(oldRSs, rollout); err != nil {
+		return err
+	}
+
 	logCtx.Info("Reconciling StableRS")
 	scaledStableRS, err := c.reconcileStableRS(oldRSs, newRS, stableRS, rollout)
 	if err != nil {
@@ -83,12 +88,7 @@ func (c *Controller) rolloutCanary(rollout *v1alpha1.Rollout, rsList []*appsv1.R
 		logCtx.Infof("Not finished reconciling Canary Pause")
 		return c.syncRolloutStatusCanary(oldRSs, newRS, stableRS, rollout)
 	}
-	if conditions.RolloutComplete(rollout, &rollout.Status) {
-		logCtx.Info("Cleaning up old replicasets")
-		if err := c.cleanupRollouts(oldRSs, rollout); err != nil {
-			return err
-		}
-	}
+
 	return c.syncRolloutStatusCanary(oldRSs, newRS, stableRS, rollout)
 }