From e09e781a0c8e08a26a89a95b2a892a4affb1314d Mon Sep 17 00:00:00 2001 From: Caleb Woodbine Date: Thu, 23 Apr 2020 16:32:54 +1200 Subject: [PATCH 1/2] Promote ServiceAccount resource lifecycle test --- test/conformance/testdata/conformance.yaml | 9 +++++++++ test/e2e/auth/service_accounts.go | 10 +++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index f0deb7acd7b2d..18261f1fd4b31 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -1317,6 +1317,15 @@ Container. release: v1.9 file: test/e2e/auth/service_accounts.go +- testname: ServiceAccount lifecycle test + codename: '[sig-auth] ServiceAccounts should run through the lifecycle of a ServiceAccount + [Conformance]' + description: Creates a ServiceAccount with a static Label MUST be added as shown + in watch event. Patching the ServiceAccount MUST return it's new property. Listing + the ServiceAccounts MUST return the test ServiceAccount with it's patched values. + ServiceAccount will be deleted and MUST find a deleted watch event. + release: v1.19 + file: test/e2e/auth/service_accounts.go - testname: Kubectl, guestbook application codename: '[sig-cli] Kubectl client Guestbook application should create and stop a working application [Conformance]' diff --git a/test/e2e/auth/service_accounts.go b/test/e2e/auth/service_accounts.go index 1e442d0117e4e..4cd0f345afd61 100644 --- a/test/e2e/auth/service_accounts.go +++ b/test/e2e/auth/service_accounts.go @@ -623,7 +623,15 @@ var _ = SIGDescribe("ServiceAccounts", func() { framework.Logf("completed pod") }) - ginkgo.It("should run through the lifecycle of a ServiceAccount", func() { + /* + Release: v1.19 + Testname: ServiceAccount lifecycle test + Description: Creates a ServiceAccount with a static Label MUST be added as shown in watch event. + Patching the ServiceAccount MUST return it's new property. + Listing the ServiceAccounts MUST return the test ServiceAccount with it's patched values. + ServiceAccount will be deleted and MUST find a deleted watch event. + */ + framework.ConformanceIt("should run through the lifecycle of a ServiceAccount", func() { testNamespaceName := f.Namespace.Name testServiceAccountName := "testserviceaccount" testServiceAccountStaticLabels := map[string]string{"test-serviceaccount-static": "true"} From bd9269f4442f27ccd2934f78d689d161f11402e2 Mon Sep 17 00:00:00 2001 From: Caleb Woodbine Date: Thu, 30 Apr 2020 14:21:04 +1200 Subject: [PATCH 2/2] Fix formatting --- test/e2e/auth/service_accounts.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/e2e/auth/service_accounts.go b/test/e2e/auth/service_accounts.go index 4cd0f345afd61..68b7b75881c7b 100644 --- a/test/e2e/auth/service_accounts.go +++ b/test/e2e/auth/service_accounts.go @@ -624,12 +624,12 @@ var _ = SIGDescribe("ServiceAccounts", func() { }) /* - Release: v1.19 - Testname: ServiceAccount lifecycle test - Description: Creates a ServiceAccount with a static Label MUST be added as shown in watch event. - Patching the ServiceAccount MUST return it's new property. - Listing the ServiceAccounts MUST return the test ServiceAccount with it's patched values. - ServiceAccount will be deleted and MUST find a deleted watch event. + Release: v1.19 + Testname: ServiceAccount lifecycle test + Description: Creates a ServiceAccount with a static Label MUST be added as shown in watch event. + Patching the ServiceAccount MUST return it's new property. + Listing the ServiceAccounts MUST return the test ServiceAccount with it's patched values. + ServiceAccount will be deleted and MUST find a deleted watch event. */ framework.ConformanceIt("should run through the lifecycle of a ServiceAccount", func() { testNamespaceName := f.Namespace.Name