Merge pull request #24280 from damemi/upstream-85162-nullable

Bug 1781768: UPSTREAM: 85162: Strip nullable for server-side apply
openshift · Dec 12, 2019 · 81205d1 · 81205d1
2 parents 7071a54 + 4d55189
commit 81205d1
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/...rnetes/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go b/...rnetes/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go
diff --git a/...io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/skeleton.go b/...io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/skeleton.go
diff --git a/...etes/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/builder/builder.go b/...etes/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/builder/builder.go
diff --git a/vendor/k8s.io/kubernetes/test/integration/apiserver/apply/apply_crd_test.go b/vendor/k8s.io/kubernetes/test/integration/apiserver/apply/apply_crd_test.go