From 29e8bef315cfaaa35d80dfe9d57d0d2f74748c8c Mon Sep 17 00:00:00 2001 From: Sergey Kanzhelev Date: Thu, 17 Mar 2022 21:49:32 +0000 Subject: [PATCH] RuntimeClass and PodOverhead promotion to GA --- test/conformance/testdata/conformance.yaml | 30 ++++++++++++++++++++++ test/e2e/common/node/runtimeclass.go | 8 +++--- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index ac7ee783f83..be4061f93c3 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -2112,6 +2112,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 index f54ea04d324..2c08475b68e 100644 --- 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()