From 819c47e3d2b48dccd2949acf1446c9058e2054d0 Mon Sep 17 00:00:00 2001
From: Jefftree <jeffrey.ying86@live.com>
Date: Mon, 23 May 2022 14:37:44 -0700
Subject: [PATCH] Prune defaults for CRD serving

Kubernetes-commit: f2ffbea836f7b232b06281529e75577d82583ec5
---
 pkg/controller/openapi/controller.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg/controller/openapi/controller.go b/pkg/controller/openapi/controller.go
index a99d95c6e..877720539 100644
--- a/pkg/controller/openapi/controller.go
+++ b/pkg/controller/openapi/controller.go
@@ -201,8 +201,10 @@ func buildVersionSpecs(crd *apiextensionsv1.CustomResourceDefinition, oldSpecs m
 		if !v.Served {
 			continue
 		}
-		// Defaults are not pruned here, but before being served.
 		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 {
 			return nil, false, err
 		}