Merge pull request #24540 from munnerz/crd-schema-type-at-root

Bug 1803163: UPSTREAM: 65357: Allow more fields at root of CRD schema if status is enabled
openshift · Feb 14, 2020 · b39752b · b39752b
2 parents d55192e + 4be15fd
commit b39752b
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 11 deletions.
diff --git a/...taging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation.go b/...taging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation.go
diff --git a/...g/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation_test.go b/...g/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation_test.go
diff --git a/...bernetes/staging/src/k8s.io/apiextensions-apiserver/test/integration/subresources_test.go b/...bernetes/staging/src/k8s.io/apiextensions-apiserver/test/integration/subresources_test.go