Merge pull request #108781 from SergeyKanzhelev/conformanceruntimeClass

RuntimeClass and PodOverhead tests promotion to Conformance
kubernetes · Mar 24, 2022 · 99e36a9 · 99e36a9
2 parents bb67b5e + 29e8bef
commit 99e36a9
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 4 deletions.
diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml
@@ -2119,6 +2119,36 @@
     patch, delete, and deletecollection.'
   release: v1.20
   file: test/e2e/common/node/runtimeclass.go
+- testname: Pod with the deleted RuntimeClass is rejected.
+  codename: '[sig-node] RuntimeClass should reject a Pod requesting a deleted RuntimeClass
+    [NodeConformance] [Conformance]'
+  description: Pod requesting the deleted RuntimeClass must be rejected.
+  release: v1.20
+  file: test/e2e/common/node/runtimeclass.go
+- testname: Pod with the non-existing RuntimeClass is rejected.
+  codename: '[sig-node] RuntimeClass should reject a Pod requesting a non-existent
+    RuntimeClass [NodeConformance] [Conformance]'
+  description: The Pod requesting the non-existing RuntimeClass must be rejected.
+  release: v1.20
+  file: test/e2e/common/node/runtimeclass.go
+- testname: RuntimeClass Overhead field must be respected.
+  codename: '[sig-node] RuntimeClass should schedule a Pod requesting a RuntimeClass
+    and initialize its Overhead [NodeConformance] [Conformance]'
+  description: The Pod requesting the existing RuntimeClass must be scheduled. This
+    test doesn't validate that the Pod will actually start because this functionality
+    depends on container runtime and preconfigured handler. Runtime-specific functionality
+    is not being tested here.
+  release: v1.24
+  file: test/e2e/common/node/runtimeclass.go
+- testname: Can schedule a pod requesting existing RuntimeClass.
+  codename: '[sig-node] RuntimeClass should schedule a Pod requesting a RuntimeClass
+    without PodOverhead [NodeConformance] [Conformance]'
+  description: The Pod requesting the existing RuntimeClass must be scheduled. This
+    test doesn't validate that the Pod will actually start because this functionality
+    depends on container runtime and preconfigured handler. Runtime-specific functionality
+    is not being tested here.
+  release: v1.20
+  file: test/e2e/common/node/runtimeclass.go
 - testname: Secrets, pod environment field
   codename: '[sig-node] Secrets should be consumable from pods in env vars [NodeConformance]
     [Conformance]'

diff --git a/test/e2e/common/node/runtimeclass.go b/test/e2e/common/node/runtimeclass.go
@@ -50,7 +50,7 @@ var _ = SIGDescribe("RuntimeClass", func() {
 		Testname: Pod with the non-existing RuntimeClass is rejected.
 		Description: The Pod requesting the non-existing RuntimeClass must be rejected.
 	*/
-	ginkgo.It("should reject a Pod requesting a non-existent RuntimeClass [NodeConformance]", func() {
+	framework.ConformanceIt("should reject a Pod requesting a non-existent RuntimeClass [NodeConformance]", func() {
 		rcName := f.Namespace.Name + "-nonexistent"
 		expectPodRejection(f, e2enode.NewRuntimeClassPod(rcName))
 	})
@@ -99,7 +99,7 @@ var _ = SIGDescribe("RuntimeClass", func() {
 		depends on container runtime and preconfigured handler. Runtime-specific functionality
 		is not being tested here.
 	*/
-	ginkgo.It("should schedule a Pod requesting a RuntimeClass without PodOverhead [NodeConformance]", func() {
+	framework.ConformanceIt("should schedule a Pod requesting a RuntimeClass without PodOverhead [NodeConformance]", func() {
 		rcName := createRuntimeClass(f, "preconfigured-handler", e2enode.PreconfiguredRuntimeClassHandler, nil)
 		defer deleteRuntimeClass(f, rcName)
 		pod := f.PodClient().Create(e2enode.NewRuntimeClassPod(rcName))
@@ -124,7 +124,7 @@ var _ = SIGDescribe("RuntimeClass", func() {
 		depends on container runtime and preconfigured handler. Runtime-specific functionality
 		is not being tested here.
 	*/
-	ginkgo.It("should schedule a Pod requesting a RuntimeClass and initialize its Overhead [NodeConformance]", func() {
+	framework.ConformanceIt("should schedule a Pod requesting a RuntimeClass and initialize its Overhead [NodeConformance]", func() {
 		rcName := createRuntimeClass(f, "preconfigured-handler", e2enode.PreconfiguredRuntimeClassHandler, &nodev1.Overhead{
 			PodFixed: v1.ResourceList{
 				v1.ResourceName(v1.ResourceCPU):    resource.MustParse("10m"),
@@ -151,7 +151,7 @@ var _ = SIGDescribe("RuntimeClass", func() {
 		Testname: Pod with the deleted RuntimeClass is rejected.
 		Description: Pod requesting the deleted RuntimeClass must be rejected.
 	*/
-	ginkgo.It("should reject a Pod requesting a deleted RuntimeClass [NodeConformance]", func() {
+	framework.ConformanceIt("should reject a Pod requesting a deleted RuntimeClass [NodeConformance]", func() {
 		rcName := createRuntimeClass(f, "delete-me", "runc", nil)
 		rcClient := f.ClientSet.NodeV1().RuntimeClasses()