From 180ce027e8f8b7f15e073f704a0778201897b0e3 Mon Sep 17 00:00:00 2001 From: Caleb Woodbine Date: Tue, 9 Jul 2019 22:11:20 +0000 Subject: [PATCH 1/5] Promote pod autoscaling --- test/conformance/testdata/conformance.txt | 1 + test/e2e/autoscaling/horizontal_pod_autoscaling.go | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/test/conformance/testdata/conformance.txt b/test/conformance/testdata/conformance.txt index 7f5af238663..47ca8477cce 100644 --- a/test/conformance/testdata/conformance.txt +++ b/test/conformance/testdata/conformance.txt @@ -38,6 +38,7 @@ test/e2e/apps/statefulset.go: "Burst scaling should run to completion even with test/e2e/apps/statefulset.go: "Should recreate evicted statefulset" test/e2e/auth/service_accounts.go: "should mount an API token into pods" test/e2e/auth/service_accounts.go: "should allow opting out of API token automount" +test/e2e/autoscaling/horizontal_pod_autoscaling.go: "Should scale from 1 pod to 2 pods" test/e2e/common/configmap.go: "should be consumable via environment variable" test/e2e/common/configmap.go: "should be consumable via the environment" test/e2e/common/configmap.go: "should fail to create ConfigMap with empty key" diff --git a/test/e2e/autoscaling/horizontal_pod_autoscaling.go b/test/e2e/autoscaling/horizontal_pod_autoscaling.go index f244177a46f..177011ae54b 100644 --- a/test/e2e/autoscaling/horizontal_pod_autoscaling.go +++ b/test/e2e/autoscaling/horizontal_pod_autoscaling.go @@ -67,7 +67,13 @@ var _ = SIGDescribe("[HPA] Horizontal pod autoscaling (scale resource: CPU)", fu }) SIGDescribe("ReplicationController light", func() { - ginkgo.It("Should scale from 1 pod to 2 pods", func() { + /* + Release : v1.16 + Testname: Up-scale pod replicas and resources + Description: Pod replicas MUST increase from 1 pod to 2 pods. + Pod CPU request will increase to 50%. + */ + framework.ConformanceIt("Should scale from 1 pod to 2 pods", func() { scaleTest := &HPAScaleTest{ initPods: 1, totalInitialCPUUsage: 150, From 4d1d096945807bf837ff8b57b3f27c6f54585d7b Mon Sep 17 00:00:00 2001 From: Devan Carpenter Date: Wed, 10 Jul 2019 20:59:19 -0700 Subject: [PATCH 2/5] Update Conformance test Metadata --- test/e2e/autoscaling/horizontal_pod_autoscaling.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/e2e/autoscaling/horizontal_pod_autoscaling.go b/test/e2e/autoscaling/horizontal_pod_autoscaling.go index 177011ae54b..d4f6d0d27f4 100644 --- a/test/e2e/autoscaling/horizontal_pod_autoscaling.go +++ b/test/e2e/autoscaling/horizontal_pod_autoscaling.go @@ -69,9 +69,12 @@ var _ = SIGDescribe("[HPA] Horizontal pod autoscaling (scale resource: CPU)", fu SIGDescribe("ReplicationController light", func() { /* Release : v1.16 - Testname: Up-scale pod replicas and resources - Description: Pod replicas MUST increase from 1 pod to 2 pods. - Pod CPU request will increase to 50%. + Testname: Horizontal Pod Autoscaling, CPU Request Scale + Description: Given 1 Pod with 150mCPU usage + And 200mCPU per Pod request + And targed CPU uitilzation is 50% + Then the HP Autoscaler will create another pod + And the 150mCPU usage will be spread across both Pods */ framework.ConformanceIt("Should scale from 1 pod to 2 pods", func() { scaleTest := &HPAScaleTest{ From 4b8a9d4467bb77d66e5f5cb1e188afa3053aac1f Mon Sep 17 00:00:00 2001 From: Devan Carpenter Date: Wed, 10 Jul 2019 21:01:37 -0700 Subject: [PATCH 3/5] Update testname and fix typo --- test/e2e/autoscaling/horizontal_pod_autoscaling.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/autoscaling/horizontal_pod_autoscaling.go b/test/e2e/autoscaling/horizontal_pod_autoscaling.go index d4f6d0d27f4..8c5473bc8e9 100644 --- a/test/e2e/autoscaling/horizontal_pod_autoscaling.go +++ b/test/e2e/autoscaling/horizontal_pod_autoscaling.go @@ -69,10 +69,10 @@ var _ = SIGDescribe("[HPA] Horizontal pod autoscaling (scale resource: CPU)", fu SIGDescribe("ReplicationController light", func() { /* Release : v1.16 - Testname: Horizontal Pod Autoscaling, CPU Request Scale + Testname: Horizontal Pod Autoscaling, CPU Target Utilization Scale Description: Given 1 Pod with 150mCPU usage And 200mCPU per Pod request - And targed CPU uitilzation is 50% + And targeted CPU uitilzation is 50% Then the HP Autoscaler will create another pod And the 150mCPU usage will be spread across both Pods */ From a87ea6f83e6fe329687e55ecaa88ef283a6f108a Mon Sep 17 00:00:00 2001 From: Stephen Heywood Date: Fri, 12 Jul 2019 01:25:18 +0000 Subject: [PATCH 4/5] Fix case and update to follow RFC2119 --- test/conformance/testdata/conformance.txt | 2 +- test/e2e/autoscaling/horizontal_pod_autoscaling.go | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/test/conformance/testdata/conformance.txt b/test/conformance/testdata/conformance.txt index 47ca8477cce..6dda8844455 100644 --- a/test/conformance/testdata/conformance.txt +++ b/test/conformance/testdata/conformance.txt @@ -38,7 +38,7 @@ test/e2e/apps/statefulset.go: "Burst scaling should run to completion even with test/e2e/apps/statefulset.go: "Should recreate evicted statefulset" test/e2e/auth/service_accounts.go: "should mount an API token into pods" test/e2e/auth/service_accounts.go: "should allow opting out of API token automount" -test/e2e/autoscaling/horizontal_pod_autoscaling.go: "Should scale from 1 pod to 2 pods" +test/e2e/autoscaling/horizontal_pod_autoscaling.go: "should scale from 1 pod to 2 pods" test/e2e/common/configmap.go: "should be consumable via environment variable" test/e2e/common/configmap.go: "should be consumable via the environment" test/e2e/common/configmap.go: "should fail to create ConfigMap with empty key" diff --git a/test/e2e/autoscaling/horizontal_pod_autoscaling.go b/test/e2e/autoscaling/horizontal_pod_autoscaling.go index 8c5473bc8e9..53ef89ccc45 100644 --- a/test/e2e/autoscaling/horizontal_pod_autoscaling.go +++ b/test/e2e/autoscaling/horizontal_pod_autoscaling.go @@ -70,11 +70,9 @@ var _ = SIGDescribe("[HPA] Horizontal pod autoscaling (scale resource: CPU)", fu /* Release : v1.16 Testname: Horizontal Pod Autoscaling, CPU Target Utilization Scale - Description: Given 1 Pod with 150mCPU usage - And 200mCPU per Pod request - And targeted CPU uitilzation is 50% - Then the HP Autoscaler will create another pod - And the 150mCPU usage will be spread across both Pods + Description: Given 1 Pod with 150mCPU usage, 200mCPU per Pod request, and + targeted CPU uitilzation of 50% the HP Autoscaler MUST create another pod, + spreading the 150mCPU usage across both Pods. */ framework.ConformanceIt("Should scale from 1 pod to 2 pods", func() { scaleTest := &HPAScaleTest{ From 8e7d6540dacc559b833b592f095c0490c72c7b47 Mon Sep 17 00:00:00 2001 From: Stephen Heywood Date: Fri, 12 Jul 2019 02:00:22 +0000 Subject: [PATCH 5/5] Update testname to match requested case --- test/e2e/autoscaling/horizontal_pod_autoscaling.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/autoscaling/horizontal_pod_autoscaling.go b/test/e2e/autoscaling/horizontal_pod_autoscaling.go index 53ef89ccc45..6a4ec5a70b7 100644 --- a/test/e2e/autoscaling/horizontal_pod_autoscaling.go +++ b/test/e2e/autoscaling/horizontal_pod_autoscaling.go @@ -74,7 +74,7 @@ var _ = SIGDescribe("[HPA] Horizontal pod autoscaling (scale resource: CPU)", fu targeted CPU uitilzation of 50% the HP Autoscaler MUST create another pod, spreading the 150mCPU usage across both Pods. */ - framework.ConformanceIt("Should scale from 1 pod to 2 pods", func() { + framework.ConformanceIt("should scale from 1 pod to 2 pods", func() { scaleTest := &HPAScaleTest{ initPods: 1, totalInitialCPUUsage: 150,