Merge pull request kubernetes#87256 from ii/promote-namespace-patch-test

Promote: Namespace patch test

Author: k8s-ci-robot

test/conformance/testdata/conformance.txt

@@ -25,6 +25,7 @@ test/e2e/apimachinery/garbage_collector.go: "should not delete dependents that h
 test/e2e/apimachinery/garbage_collector.go: "should not be blocked by dependency circle"
 test/e2e/apimachinery/namespace.go: "should ensure that all pods are removed when a namespace is deleted"
 test/e2e/apimachinery/namespace.go: "should ensure that all services are removed when a namespace is deleted"
+test/e2e/apimachinery/namespace.go: "should patch a Namespace"
 test/e2e/apimachinery/resource_quota.go: "should create a ResourceQuota and ensure its status is promptly calculated."
 test/e2e/apimachinery/resource_quota.go: "should create a ResourceQuota and capture the life of a service."
 test/e2e/apimachinery/resource_quota.go: "should create a ResourceQuota and capture the life of a secret."

test/e2e/apimachinery/namespace.go

@@ -249,7 +249,14 @@ var _ = SIGDescribe("Namespaces [Serial]", func() {
 	ginkgo.It("should always delete fast (ALL of 100 namespaces in 150 seconds) [Feature:ComprehensiveNamespaceDraining]",
 		func() { extinguish(f, 100, 0, 150) })
 
-	ginkgo.It("should patch a Namespace", func() {
+	/*
+	   Release : v1.18
+	   Testname: Namespace patching
+	   Description: A Namespace is created.
+	   The Namespace is patched.
+	   The Namespace and MUST now include the new Label.
+	*/
+	framework.ConformanceIt("should patch a Namespace", func() {
 		ginkgo.By("creating a Namespace")
 		namespaceName := "nspatchtest-" + string(uuid.NewUUID())
 		ns, err := f.CreateNamespace(namespaceName, nil)