From a0623672511775f936b694c7eaae8076b5316ee2 Mon Sep 17 00:00:00 2001 From: Caleb Woodbine Date: Mon, 15 Jul 2019 02:02:39 +0000 Subject: [PATCH 1/2] Promote StatefulSet Replica scaling --- test/conformance/testdata/conformance.txt | 1 + test/e2e/apps/statefulset.go | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/test/conformance/testdata/conformance.txt b/test/conformance/testdata/conformance.txt index 7f5af238663..3366aa51f49 100644 --- a/test/conformance/testdata/conformance.txt +++ b/test/conformance/testdata/conformance.txt @@ -36,6 +36,7 @@ test/e2e/apps/statefulset.go: "should perform canary updates and phased rolling test/e2e/apps/statefulset.go: "Scaling should happen in predictable order and halt if any stateful pod is unhealthy" test/e2e/apps/statefulset.go: "Burst scaling should run to completion even with unhealthy pods" test/e2e/apps/statefulset.go: "Should recreate evicted statefulset" +test/e2e/apps/statefulset.go: "should have a working scale subresource" 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/common/configmap.go: "should be consumable via environment variable" diff --git a/test/e2e/apps/statefulset.go b/test/e2e/apps/statefulset.go index 31ad28d1566..0f33f588048 100644 --- a/test/e2e/apps/statefulset.go +++ b/test/e2e/apps/statefulset.go @@ -25,7 +25,7 @@ import ( "github.com/onsi/ginkgo" "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" klabels "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/types" @@ -762,7 +762,14 @@ var _ = SIGDescribe("StatefulSet", func() { }, e2esset.StatefulPodTimeout, 2*time.Second).Should(gomega.BeNil()) }) - ginkgo.It("should have a working scale subresource", func() { + /* + Release : v1.16 + Testname: StatefulSet resource Replica scaling + Description: Create a StatefulSet resource. + Newly created StatefulSet resource MUST have a scale of one. + Bring the scale of the StatefulSet resource up to two. StatefulSet scale MUST be at two replicas. + */ + framework.ConformanceIt("should have a working scale subresource", func() { ginkgo.By("Creating statefulset " + ssName + " in namespace " + ns) ss := e2esset.NewStatefulSet(ssName, ns, headlessSvcName, 1, nil, nil, labels) e2esset.SetHTTPProbe(ss) From 1e8f5feffdcc9e0f485153c22c1e19d1f8b69596 Mon Sep 17 00:00:00 2001 From: Caleb Woodbine Date: Mon, 15 Jul 2019 03:53:56 +0000 Subject: [PATCH 2/2] Fix imports, Formatting of text --- test/e2e/apps/statefulset.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/e2e/apps/statefulset.go b/test/e2e/apps/statefulset.go index 0f33f588048..1d790f5428c 100644 --- a/test/e2e/apps/statefulset.go +++ b/test/e2e/apps/statefulset.go @@ -25,7 +25,7 @@ import ( "github.com/onsi/ginkgo" "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" - v1 "k8s.io/api/core/v1" + "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" klabels "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/types" @@ -763,11 +763,11 @@ var _ = SIGDescribe("StatefulSet", func() { }) /* - Release : v1.16 - Testname: StatefulSet resource Replica scaling - Description: Create a StatefulSet resource. - Newly created StatefulSet resource MUST have a scale of one. - Bring the scale of the StatefulSet resource up to two. StatefulSet scale MUST be at two replicas. + Release : v1.16 + Testname: StatefulSet resource Replica scaling + Description: Create a StatefulSet resource. + Newly created StatefulSet resource MUST have a scale of one. + Bring the scale of the StatefulSet resource up to two. StatefulSet scale MUST be at two replicas. */ framework.ConformanceIt("should have a working scale subresource", func() { ginkgo.By("Creating statefulset " + ssName + " in namespace " + ns)