diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index 4f25e6126c5..401aa5d0d8d 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -778,6 +778,32 @@ code of 406. release: v1.16 file: test/e2e/apimachinery/table_conversion.go +- testname: ValidatingAdmissionPolicy + codename: '[sig-api-machinery] ValidatingAdmissionPolicy [Privileged:ClusterAdmin] + should allow expressions to refer variables. [Conformance]' + description: ' The ValidatingAdmissionPolicy should allow expressions to refer variables.' + release: v1.30 + file: test/e2e/apimachinery/validatingadmissionpolicy.go +- testname: ValidatingAdmissionPolicy + codename: '[sig-api-machinery] ValidatingAdmissionPolicy [Privileged:ClusterAdmin] + should type check a CRD [Conformance]' + description: ' The ValidatingAdmissionPolicy should type check a CRD.' + release: v1.30 + file: test/e2e/apimachinery/validatingadmissionpolicy.go +- testname: ValidatingAdmissionPolicy + codename: '[sig-api-machinery] ValidatingAdmissionPolicy [Privileged:ClusterAdmin] + should type check validation expressions [Conformance]' + description: ' The ValidatingAdmissionPolicy should type check the expressions defined + inside policy.' + release: v1.30 + file: test/e2e/apimachinery/validatingadmissionpolicy.go +- testname: ValidatingAdmissionPolicy + codename: '[sig-api-machinery] ValidatingAdmissionPolicy [Privileged:ClusterAdmin] + should validate against a Deployment [Conformance]' + description: ' The ValidatingAdmissionPolicy should validate a deployment as the + expression defined inside the policy.' + release: v1.30 + file: test/e2e/apimachinery/validatingadmissionpolicy.go - testname: watch-configmaps-closed-and-restarted codename: '[sig-api-machinery] Watchers should be able to restart watching from the last resource version observed by the previous watch [Conformance]' diff --git a/test/e2e/apimachinery/validatingadmissionpolicy.go b/test/e2e/apimachinery/validatingadmissionpolicy.go index 68e99221ec8..b3b051b319f 100644 --- a/test/e2e/apimachinery/validatingadmissionpolicy.go +++ b/test/e2e/apimachinery/validatingadmissionpolicy.go @@ -32,14 +32,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/apiserver/pkg/features" clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/openapi3" "k8s.io/kubernetes/test/e2e/framework" admissionapi "k8s.io/pod-security-admission/api" ) -var _ = SIGDescribe("ValidatingAdmissionPolicy [Privileged:ClusterAdmin]", framework.WithFeatureGate(features.ValidatingAdmissionPolicy), func() { +var _ = SIGDescribe("ValidatingAdmissionPolicy [Privileged:ClusterAdmin]", func() { f := framework.NewDefaultFramework("validating-admission-policy") f.NamespacePodSecurityLevel = admissionapi.LevelBaseline @@ -62,7 +61,13 @@ var _ = SIGDescribe("ValidatingAdmissionPolicy [Privileged:ClusterAdmin]", frame labelNamespace(ctx, f, f.Namespace.Name) }) - ginkgo.It("should validate against a Deployment", func(ctx context.Context) { + /* + Release: v1.30 + Testname: ValidatingAdmissionPolicy + Description: + The ValidatingAdmissionPolicy should validate a deployment as the expression defined inside the policy. + */ + framework.ConformanceIt("should validate against a Deployment", func(ctx context.Context) { ginkgo.By("creating the policy", func() { policy := newValidatingAdmissionPolicyBuilder(f.UniqueName+".policy.example.com"). MatchUniqueNamespace(f.UniqueName). @@ -119,7 +124,13 @@ var _ = SIGDescribe("ValidatingAdmissionPolicy [Privileged:ClusterAdmin]", frame }) }) - ginkgo.It("should type check validation expressions", func(ctx context.Context) { + /* + Release: v1.30 + Testname: ValidatingAdmissionPolicy + Description: + The ValidatingAdmissionPolicy should type check the expressions defined inside policy. + */ + framework.ConformanceIt("should type check validation expressions", func(ctx context.Context) { var policy *admissionregistrationv1.ValidatingAdmissionPolicy ginkgo.By("creating the policy with correct types", func() { policy = newValidatingAdmissionPolicyBuilder(f.UniqueName+".correct-policy.example.com"). @@ -194,7 +205,13 @@ var _ = SIGDescribe("ValidatingAdmissionPolicy [Privileged:ClusterAdmin]", frame }) }) - ginkgo.It("should allow expressions to refer variables.", func(ctx context.Context) { + /* + Release: v1.30 + Testname: ValidatingAdmissionPolicy + Description: + The ValidatingAdmissionPolicy should allow expressions to refer variables. + */ + framework.ConformanceIt("should allow expressions to refer variables.", func(ctx context.Context) { ginkgo.By("creating a policy with variables", func() { policy := newValidatingAdmissionPolicyBuilder(f.UniqueName+".policy.example.com"). MatchUniqueNamespace(f.UniqueName). @@ -257,7 +274,13 @@ var _ = SIGDescribe("ValidatingAdmissionPolicy [Privileged:ClusterAdmin]", frame }) }) - ginkgo.It("should type check a CRD", func(ctx context.Context) { + /* + Release: v1.30 + Testname: ValidatingAdmissionPolicy + Description: + The ValidatingAdmissionPolicy should type check a CRD. + */ + framework.ConformanceIt("should type check a CRD", func(ctx context.Context) { crd := crontabExampleCRD() crd.Spec.Group = "stable." + f.UniqueName crd.Name = crd.Spec.Names.Plural + "." + crd.Spec.Group