From eb5f31b9e1a1c4473e0068ff66faa884d338f0a4 Mon Sep 17 00:00:00 2001 From: Joe Betz Date: Sat, 2 Mar 2024 11:14:06 -0500 Subject: [PATCH] Add x-kubernetes-selectable-fields to fields excluded in publish openapi conformance comparisons --- test/e2e/apimachinery/crd_publish_openapi.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/e2e/apimachinery/crd_publish_openapi.go b/test/e2e/apimachinery/crd_publish_openapi.go index 57b82312dd8..ac816997810 100644 --- a/test/e2e/apimachinery/crd_publish_openapi.go +++ b/test/e2e/apimachinery/crd_publish_openapi.go @@ -27,9 +27,10 @@ import ( "time" "github.com/onsi/ginkgo/v2" + "sigs.k8s.io/yaml" + openapiutil "k8s.io/kube-openapi/pkg/util" "k8s.io/utils/pointer" - "sigs.k8s.io/yaml" "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" @@ -713,6 +714,7 @@ func dropDefaults(s *spec.Schema) { delete(s.Properties, "apiVersion") delete(s.Properties, "kind") delete(s.Extensions, "x-kubernetes-group-version-kind") + delete(s.Extensions, "x-kubernetes-selectable-fields") } func verifyKubectlExplain(ns, name, pattern string) error {