github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 03:57:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #123646 from jpbetz/fix-openapi-conformance-selectable-fields

Browse Source 
Fix publish openapi conformance tests to ignore x-kubernetes-selectable-fields
This commit is contained in:
Kubernetes Prow Robot 2024-03-02 09:23:42 -08:00 committed by GitHub
commit 96a5cfe513
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/apimachinery/crd_publish_openapi.go
View File

@ -27,9 +27,10 @@ import (
"time" "time"
"github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2"
"sigs.k8s.io/yaml"
openapiutil "k8s.io/kube-openapi/pkg/util" openapiutil "k8s.io/kube-openapi/pkg/util"
"k8s.io/utils/pointer" "k8s.io/utils/pointer"
"sigs.k8s.io/yaml"
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" 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, "apiVersion")
delete(s.Properties, "kind") delete(s.Properties, "kind")
delete(s.Extensions, "x-kubernetes-group-version-kind") delete(s.Extensions, "x-kubernetes-group-version-kind")
delete(s.Extensions, "x-kubernetes-selectable-fields")
} }
func verifyKubectlExplain(ns, name, pattern string) error { func verifyKubectlExplain(ns, name, pattern string) error {