fix: Make kubectl plugin backwards compat with canary.stableRS (#482)

argoproj · Apr 20, 2020 · e93c474 · e93c474
1 parent dbc2f5c
commit e93c474
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/pkg/kubectl-argo-rollouts/info/info_test.go b/pkg/kubectl-argo-rollouts/info/info_test.go
@@ -232,6 +232,16 @@ func TestRolloutStatusProgressing(t *testing.T) {
 		ro := newCanaryRollout()
 		ro.Status.StableRS = "abc1234"
 		ro.Status.CurrentPodHash = "def5678"
+		ro.Status.UpdatedReplicas = 4
+		ro.Status.AvailableReplicas = 4
+		assert.Equal(t, "Progressing", RolloutStatusString(ro))
+	}
+	{
+		ro := newCanaryRollout()
+		ro.Status.Canary.StableRS = "abc1234"
+		ro.Status.CurrentPodHash = "def5678"
+		ro.Status.UpdatedReplicas = 4
+		ro.Status.AvailableReplicas = 4
 		assert.Equal(t, "Progressing", RolloutStatusString(ro))
 	}
 	{

diff --git a/pkg/kubectl-argo-rollouts/info/rollout_info.go b/pkg/kubectl-argo-rollouts/info/rollout_info.go
@@ -121,7 +121,12 @@ func RolloutStatusString(ro *v1alpha1.Rollout) string {
 			// old replicas are pending termination
 			return "Progressing"
 		}
-		if ro.Status.StableRS != "" && ro.Status.StableRS == ro.Status.CurrentPodHash {
+		stableRS := ro.Status.StableRS
+		//TODO(dthomson) Remove canary.stableRS for v0.9
+		if ro.Status.Canary.StableRS != "" {
+			stableRS = ro.Status.Canary.StableRS
+		}
+		if stableRS != "" && stableRS == ro.Status.CurrentPodHash {
 			return "Healthy"
 		}
 		// Waiting for rollout to finish steps