From c59fba7f2674e78c645d77ba8277c1e5a0ea39bf Mon Sep 17 00:00:00 2001 From: Joe Betz Date: Wed, 30 Oct 2024 17:19:25 -0400 Subject: [PATCH] Promote CRD field selector e2e test to conformance (#128109) * Promote CRD field selector e2e test to conformance * Fix release number for conformance test * re-run update conformance --- test/conformance/testdata/conformance.yaml | 13 +++++++++++++ test/e2e/apimachinery/crd_selectable_fields.go | 16 ++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index 21430dea0dd..eac09a39db4 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -330,6 +330,19 @@ resources are available. release: v1.16 file: test/e2e/apimachinery/custom_resource_definition.go +- testname: custom-resource-definition-field-selectors-list-watch-register-informers + codename: '[sig-api-machinery] CustomResourceFieldSelectors [Privileged:ClusterAdmin] + CustomResourceFieldSelectors MUST list and watch custom resources matching the + field selector [Conformance]' + description: Create a Custom Resource Definition with SelectableFields. Create a + custom resource with two versions and a conversion webhook that converts between + the versions. Attempt to list, watch and register informers for the custom resources + with field selectors; the lists, watches and informers MUST return only custom + resources matching the field selector. Delete and update some of the resources + with field selectors; the lists, watches and informers MUST return only the custom + resources matching custom resources. + release: v1.32 + file: test/e2e/apimachinery/crd_selectable_fields.go - testname: Custom Resource OpenAPI Publish, stop serving version codename: '[sig-api-machinery] CustomResourcePublishOpenAPI [Privileged:ClusterAdmin] removes definition from spec when one version gets changed to not be served [Conformance]' diff --git a/test/e2e/apimachinery/crd_selectable_fields.go b/test/e2e/apimachinery/crd_selectable_fields.go index da02331be32..a5843b469f6 100644 --- a/test/e2e/apimachinery/crd_selectable_fields.go +++ b/test/e2e/apimachinery/crd_selectable_fields.go @@ -113,15 +113,15 @@ var _ = SIGDescribe("CustomResourceFieldSelectors [Privileged:ClusterAdmin]", fu }) /* - Release: v1.31 - Testname: Custom Resource Definition, list and watch with selectable fields - Description: Create a Custom Resource Definition with SelectableFields. Create custom resources. Attempt to - list and watch custom resources with object selectors; the list and watch MUST return only custom resources - matching the field selector. Delete and update some of the custom resources. Attempt to list and watch the - custom resources with object selectors; the list and watch MUST return only the custom resources matching - the object selectors. + Release: v1.32 + Testname: custom-resource-definition-field-selectors-list-watch-register-informers + Description: Create a Custom Resource Definition with SelectableFields. Create a custom resource with + two versions and a conversion webhook that converts between the versions. Attempt to list, watch and register + informers for the custom resources with field selectors; the lists, watches and informers MUST return only + custom resources matching the field selector. Delete and update some of the resources with field selectors; + the lists, watches and informers MUST return only the custom resources matching custom resources. */ - framework.It("MUST list and watch custom resources matching the field selector", func(ctx context.Context) { + framework.ConformanceIt("MUST list and watch custom resources matching the field selector", func(ctx context.Context) { ginkgo.By("Creating a custom resource definition with selectable fields") testcrd, err := crd.CreateMultiVersionTestCRD(f, "stable.example.com", func(crd *apiextensionsv1.CustomResourceDefinition) { crd.Spec.Versions = apiVersions