Merge pull request kubernetes#123939 from cici37/vapGAConformance

Change the API tests to conformance tests
openshift · Mar 18, 2024 · 2753078 · 2753078
2 parents aa73f31 + 4048598
commit 2753078
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml
@@ -784,6 +784,28 @@
   description: ' The ValidatingAdmissionPolicy should allow expressions to refer variables.'
   release: v1.30
   file: test/e2e/apimachinery/validatingadmissionpolicy.go
+- testname: ValidatingAdmissionPolicy API
+  codename: '[sig-api-machinery] ValidatingAdmissionPolicy [Privileged:ClusterAdmin]
+    should support ValidatingAdmissionPolicy API operations [Conformance]'
+  description: ' The admissionregistration.k8s.io API group MUST exist in the /apis
+    discovery document. The admissionregistration.k8s.io/v1 API group/version MUST
+    exist in the /apis/admissionregistration.k8s.io discovery document. The validatingadmisionpolicy
+    and validatingadmissionpolicy/status resources MUST exist in the /apis/admissionregistration.k8s.io/v1
+    discovery document. The validatingadmisionpolicy resource must support create,
+    get, list, watch, update, patch, delete, and deletecollection.'
+  release: v1.30
+  file: test/e2e/apimachinery/validatingadmissionpolicy.go
+- testname: ValidatingadmissionPolicyBinding API
+  codename: '[sig-api-machinery] ValidatingAdmissionPolicy [Privileged:ClusterAdmin]
+    should support ValidatingAdmissionPolicyBinding API operations [Conformance]'
+  description: ' The admissionregistration.k8s.io API group MUST exist in the /apis
+    discovery document. The admissionregistration.k8s.io/v1 API group/version MUST
+    exist in the /apis/admissionregistration.k8s.io discovery document. The ValidatingadmissionPolicyBinding
+    resources MUST exist in the /apis/admissionregistration.k8s.io/v1 discovery document.
+    The ValidatingadmissionPolicyBinding resource must support create, get, list,
+    watch, update, patch, delete, and deletecollection.'
+  release: v1.30
+  file: test/e2e/apimachinery/validatingadmissionpolicy.go
 - testname: ValidatingAdmissionPolicy
   codename: '[sig-api-machinery] ValidatingAdmissionPolicy [Privileged:ClusterAdmin]
     should validate against a Deployment [Conformance]'

diff --git a/test/e2e/apimachinery/validatingadmissionpolicy.go b/test/e2e/apimachinery/validatingadmissionpolicy.go
@@ -403,7 +403,7 @@ var _ = SIGDescribe("ValidatingAdmissionPolicy [Privileged:ClusterAdmin]", func(
 	   The validatingadmisionpolicy resource must support create, get,
 	     list, watch, update, patch, delete, and deletecollection.
 	*/
-	ginkgo.It("should support ValidatingAdmissionPolicy API operations", func(ctx context.Context) {
+	framework.ConformanceIt("should support ValidatingAdmissionPolicy API operations", func(ctx context.Context) {
 		vapVersion := "v1"
 		ginkgo.By("getting /apis")
 		{
@@ -670,7 +670,7 @@ var _ = SIGDescribe("ValidatingAdmissionPolicy [Privileged:ClusterAdmin]", func(
 	   The ValidatingadmissionPolicyBinding resource must support create, get,
 	     list, watch, update, patch, delete, and deletecollection.
 	*/
-	ginkgo.It("should support ValidatingAdmissionPolicyBinding API operations", func(ctx context.Context) {
+	framework.ConformanceIt("should support ValidatingAdmissionPolicyBinding API operations", func(ctx context.Context) {
 		vapbVersion := "v1"
 		ginkgo.By("getting /apis")
 		{