fix: unavailable stable RS was not scaled down to make room for canary (

#739)
argoproj · Sep 28, 2020 · 8239dd7 · 8239dd7
1 parent cb198b3
commit 8239dd7
Show file tree

Hide file tree

Showing 19 changed files with 540 additions and 154 deletions.
diff --git a/test/e2e/analysis_test.go b/test/e2e/analysis_test.go
@@ -15,6 +15,7 @@ type AnalysisSuite struct {
 }
 
 func (s *AnalysisSuite) TestRolloutWithBackgroundAnalysis() {
+	s.T().Parallel()
 	s.Given().
 		RolloutObjects("@functional/analysistemplate-web-background.yaml").
 		RolloutObjects("@functional/rollout-background-analysis.yaml").
@@ -24,7 +25,7 @@ func (s *AnalysisSuite) TestRolloutWithBackgroundAnalysis() {
 		Then().
 		ExpectAnalysisRunCount(0).
 		When().
-		UpdateImage("argoproj/rollouts-demo:yellow").
+		UpdateSpec().
 		WaitForRolloutStatus("Paused").
 		Then().
 		ExpectAnalysisRunCount(1).
@@ -36,6 +37,7 @@ func (s *AnalysisSuite) TestRolloutWithBackgroundAnalysis() {
 }
 
 func (s *AnalysisSuite) TestRolloutWithInlineAnalysis() {
+	s.T().Parallel()
 	s.Given().
 		RolloutObjects("@functional/analysistemplate-echo-job.yaml").
 		RolloutObjects("@functional/rollout-inline-analysis.yaml").
@@ -45,7 +47,7 @@ func (s *AnalysisSuite) TestRolloutWithInlineAnalysis() {
 		Then().
 		ExpectAnalysisRunCount(0).
 		When().
-		UpdateImage("argoproj/rollouts-demo:yellow").
+		UpdateSpec().
 		WaitForRolloutStatus("Paused").
 		Then().
 		ExpectAnalysisRunCount(1).

diff --git a/test/e2e/canary_test.go b/test/e2e/canary_test.go
@@ -14,8 +14,13 @@ type CanarySuite struct {
 	fixtures.E2ESuite
 }
 
+func TestCanarySuite(t *testing.T) {
+	suite.Run(t, new(CanarySuite))
+}
+
 func (s *CanarySuite) TestCanarySetCanaryScale() {
 	s.T().Skip("skipping v0.10 feature")
+	s.T().Parallel()
 	canarySteps := `
 - pause: {}
 - setCanaryScale:
@@ -36,42 +41,116 @@ func (s *CanarySuite) TestCanarySetCanaryScale() {
 		When().
 		ApplyManifests().
 		WaitForRolloutStatus("Healthy").
-		UpdateImage("argoproj/rollouts-demo:yellow").
+		UpdateSpec().
 		// at step 0
 		WaitForRolloutStatus("Paused").
 		Then().
-		ExpectCanaryPodCount(0).
+		ExpectCanaryStablePodCount(0, 4).
 		When().
 		PromoteRollout().
 		WaitForRolloutCanaryStepIndex(2).
 		Then().
 		// at step 2
-		ExpectCanaryPodCount(1).
+		ExpectCanaryStablePodCount(1, 4).
 		When().
 		PromoteRollout().
 		WaitForRolloutCanaryStepIndex(4).
 		Then().
 		// at step 4
-		ExpectCanaryPodCount(1).
+		ExpectCanaryStablePodCount(1, 4).
 		When().
 		PromoteRollout().
 		WaitForRolloutCanaryStepIndex(6).
 		Then().
 		// at step 6
-		ExpectCanaryPodCount(3).
+		ExpectCanaryStablePodCount(3, 4).
 		When().
 		PromoteRollout().
 		WaitForRolloutCanaryStepIndex(8).
 		Then().
 		// at step 8
-		ExpectCanaryPodCount(2).
+		ExpectCanaryStablePodCount(2, 4).
 		When().
 		PromoteRollout().
 		WaitForRolloutStatus("Healthy").
 		Then().
-		ExpectCanaryPodCount(4)
+		ExpectCanaryStablePodCount(4, 4)
 }
 
-func TestCanarySuite(t *testing.T) {
-	suite.Run(t, new(CanarySuite))
+// TestRolloutScalingWhenPaused verifies behavior when scaling a rollout up/down when paused
+func (s *FunctionalSuite) TestRolloutScalingWhenPaused() {
+	s.Given().
+		RolloutObjects(`@functional/rollout-basic.yaml`).
+		SetSteps(`
+- setWeight: 25
+- pause: {}`).
+		When().
+		ApplyManifests().
+		WaitForRolloutStatus("Healthy").
+		UpdateSpec().
+		WaitForRolloutStatus("Paused").
+		Then().
+		ExpectCanaryStablePodCount(1, 1).
+		When().
+		ScaleRollout(8).
+		WaitForRolloutAvailableReplicas(8).
+		Then().
+		ExpectCanaryStablePodCount(2, 6).
+		When().
+		ScaleRollout(4).
+		WaitForRolloutAvailableReplicas(4).
+		Then().
+		ExpectCanaryStablePodCount(1, 3)
+}
+
+// TestRolloutScalingDuringUpdate verifies behavior when scaling a rollout up/down in middle of update
+func (s *FunctionalSuite) TestRolloutScalingDuringUpdate() {
+	s.Given().
+		HealthyRollout(`
+apiVersion: argoproj.io/v1alpha1
+kind: Rollout
+metadata:
+  name: updatescaling
+spec:
+  replicas: 4
+  strategy:
+    canary:
+      maxSurge: 2
+      maxUnavailable: 0
+  selector:
+    matchLabels:
+      app: updatescaling
+  template:
+    metadata:
+      labels:
+        app: updatescaling
+    spec:
+      containers:
+      - name: updatescaling
+        image: nginx:1.19-alpine
+        resources:
+          requests:
+            memory: 16Mi
+            cpu: 1m`).
+		When().
+		PatchSpec(`
+spec:
+  template:
+    spec:
+      containers:
+      - name: updatescaling
+        command: [/bad-command]`).
+		WaitForRolloutReplicas(6).
+		Then().
+		ExpectCanaryStablePodCount(2, 4).
+		When().
+		ScaleRollout(8).
+		WaitForRolloutReplicas(10).
+		Then().
+		// NOTE: the numbers below may change in the future.
+		// See: https://github.com/argoproj/argo-rollouts/issues/738
+		ExpectCanaryStablePodCount(6, 4).
+		When().
+		ScaleRollout(4)
+	// WaitForRolloutReplicas(4) // this doesn't work yet (bug)
 }
diff --git a/test/e2e/experiment_test.go b/test/e2e/experiment_test.go
@@ -15,6 +15,7 @@ type ExperimentSuite struct {
 }
 
 func (s *ExperimentSuite) TestRolloutWithExperiment() {
+	s.T().Parallel()
 	s.Given().
 		RolloutObjects("@functional/rollout-experiment.yaml").
 		When().
@@ -23,7 +24,7 @@ func (s *ExperimentSuite) TestRolloutWithExperiment() {
 		// TODO: verify there are no experiments
 		Then().
 		When().
-		UpdateImage("argoproj/rollouts-demo:yellow").
+		UpdateSpec().
 		// TODO: wait for experiment to start and complete successful
 		// TODO: verify pods
 		WaitForRolloutStatus("Paused").

diff --git a/test/e2e/functional/alb-template.yaml b/test/e2e/functional/alb-template.yaml
@@ -14,14 +14,14 @@ spec:
     spec:
       containers:
       - name: REPLACEME
-        image: argoproj/rollouts-demo:blue
+        image: nginx:1.19-alpine
         ports:
         - name: http
-          containerPort: 8080
+          containerPort: 80
           protocol: TCP
         resources:
           requests:
-            memory: 32Mi
+            memory: 16Mi
             cpu: 5m
   strategy:
     canary:

diff --git a/test/e2e/functional/analysis-run-job.yaml b/test/e2e/functional/analysis-run-job.yaml
@@ -12,7 +12,7 @@ spec:
             spec:
               containers:
               - name: sleep
-                image: alpine:3.8
+                image: nginx:1.19-alpine
                 command: [sleep, "30"]
               restartPolicy: Never
           backoffLimit: 0
diff --git a/test/e2e/functional/analysistemplate-echo-job.yaml b/test/e2e/functional/analysistemplate-echo-job.yaml
@@ -12,7 +12,7 @@ spec:
             spec:
               containers:
               - name: sleep
-                image: alpine:3.12
+                image: nginx:1.19-alpine
                 command: [echo, done]
               restartPolicy: Never
           backoffLimit: 0
diff --git a/test/e2e/functional/rollout-background-analysis.yaml b/test/e2e/functional/rollout-background-analysis.yaml
@@ -21,13 +21,8 @@ spec:
     spec:
       containers:
       - name: rollouts-demo
-        image: argoproj/rollouts-demo:blue
-        args: [--termination-delay, "0"]
-        ports:
-        - name: http
-          containerPort: 8080
-          protocol: TCP
+        image: nginx:1.19-alpine
         resources:
           requests:
-            memory: 32Mi
+            memory: 16Mi
             cpu: 5m
diff --git a/test/e2e/functional/rollout-basic.yaml b/test/e2e/functional/rollout-basic.yaml
@@ -17,14 +17,8 @@ spec:
         app: basic
     spec:
       containers:
-      - name: rollouts-demo
-        image: argoproj/rollouts-demo:blue
-        imagePullPolicy: IfNotPresent
-        # reduce termination delay (default 10s) for e2e tests
-        args: [--termination-delay, "0"]
-        ports:
-        - name: http
-          containerPort: 8080
+      - name: basic
+        image: nginx:1.19-alpine
         resources:
           requests:
             memory: 16Mi

diff --git a/test/e2e/functional/rollout-container-resource-formats.yaml b/test/e2e/functional/rollout-container-resource-formats.yaml
diff --git a/test/e2e/functional/rollout-experiment.yaml b/test/e2e/functional/rollout-experiment.yaml
@@ -25,13 +25,8 @@ spec:
     spec:
       containers:
       - name: rollouts-demo
-        image: argoproj/rollouts-demo:blue
-        args: [--termination-delay, "0"]
-        ports:
-        - name: http
-          containerPort: 8080
-          protocol: TCP
+        image: nginx:1.19-alpine
         resources:
           requests:
-            memory: 32Mi
+            memory: 16Mi
             cpu: 5m
diff --git a/test/e2e/functional/rollout-inline-analysis.yaml b/test/e2e/functional/rollout-inline-analysis.yaml
@@ -27,13 +27,8 @@ spec:
     spec:
       containers:
       - name: rollouts-demo
-        image: argoproj/rollouts-demo:blue
-        args: [--termination-delay, "0"]
-        ports:
-        - name: http
-          containerPort: 8080
-          protocol: TCP
+        image: nginx:1.19-alpine
         resources:
           requests:
-            memory: 32Mi
+            memory: 16Mi
             cpu: 5m