From 2e43a6dc78843bfb2cee713371dd52ca95a3e43f Mon Sep 17 00:00:00 2001 From: Ryan Zhang Date: Mon, 12 Apr 2021 15:48:20 -0700 Subject: [PATCH] make sure we don't create more pods (#1452) --- test/e2e-test/rollout_plan_test.go | 3 +-- test/e2e-test/testdata/rollout/cloneset/app-no-replica.yaml | 2 +- test/e2e-test/testdata/rollout/cloneset/app-source.yaml | 2 +- test/e2e-test/testdata/rollout/cloneset/app-target.yaml | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/test/e2e-test/rollout_plan_test.go b/test/e2e-test/rollout_plan_test.go index 2d44490fb..608b33af1 100644 --- a/test/e2e-test/rollout_plan_test.go +++ b/test/e2e-test/rollout_plan_test.go @@ -272,10 +272,9 @@ var _ = Describe("Cloneset based rollout tests", func() { AfterEach(func() { By("Clean up resources after a test") + k8sClient.Delete(ctx, &app) k8sClient.Delete(ctx, &appRollout) verifyRolloutDeleted() - By("Delete the application") - k8sClient.Delete(ctx, &app) By(fmt.Sprintf("Delete the entire namespaceName %s", ns.Name)) // delete the namespaceName with all its resources Expect(k8sClient.Delete(ctx, &ns, client.PropagationPolicy(metav1.DeletePropagationBackground))).Should(BeNil()) diff --git a/test/e2e-test/testdata/rollout/cloneset/app-no-replica.yaml b/test/e2e-test/testdata/rollout/cloneset/app-no-replica.yaml index 5b5963d07..bd049376e 100644 --- a/test/e2e-test/testdata/rollout/cloneset/app-no-replica.yaml +++ b/test/e2e-test/testdata/rollout/cloneset/app-no-replica.yaml @@ -14,4 +14,4 @@ spec: - stress-cpu=1 image: stefanprodan/podinfo:4.0.3 port: 8080 - updateStrategyType: InPlaceIfPossible \ No newline at end of file + updateStrategyType: InPlaceOnly \ No newline at end of file diff --git a/test/e2e-test/testdata/rollout/cloneset/app-source.yaml b/test/e2e-test/testdata/rollout/cloneset/app-source.yaml index 9501f1405..34b84ab67 100644 --- a/test/e2e-test/testdata/rollout/cloneset/app-source.yaml +++ b/test/e2e-test/testdata/rollout/cloneset/app-source.yaml @@ -14,5 +14,5 @@ spec: - stress-cpu=1 image: stefanprodan/podinfo:4.0.3 port: 8080 - updateStrategyType: InPlaceIfPossible + updateStrategyType: InPlaceOnly replicas: 5 \ No newline at end of file diff --git a/test/e2e-test/testdata/rollout/cloneset/app-target.yaml b/test/e2e-test/testdata/rollout/cloneset/app-target.yaml index 27a4b86c6..86c67dd44 100644 --- a/test/e2e-test/testdata/rollout/cloneset/app-target.yaml +++ b/test/e2e-test/testdata/rollout/cloneset/app-target.yaml @@ -14,5 +14,5 @@ spec: - stress-cpu=1 image: stefanprodan/podinfo:5.0.2 port: 8080 - updateStrategyType: InPlaceIfPossible + updateStrategyType: InPlaceOnly replicas: 5 \ No newline at end of file