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

Prune defaults for CRD serving

Browse Source
This commit is contained in:
Jefftree
2022-05-23 14:37:44 -07:00
parent 31a10245d6
commit d0bf411cc7
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/controller.go
View File

@@ -201,8 +201,10 @@ func buildVersionSpecs(crd *apiextensionsv1.CustomResourceDefinition, oldSpecs m
if !v.Served { if !v.Served {
continue continue
} }
// Defaults are not pruned here, but before being served.
spec, err := builder.BuildOpenAPIV2(crd, v.Name, builder.Options{V2: true}) spec, err := builder.BuildOpenAPIV2(crd, v.Name, builder.Options{V2: true})
// Defaults must be pruned here for CRDs to cleanly merge with the static
// spec that already has defaults pruned
spec.Definitions = handler.PruneDefaults(spec.Definitions)
if err != nil { if err != nil {
return nil, false, err return nil, false, err
} }