From 08e756342c225d681fc9dced95fae57892385541 Mon Sep 17 00:00:00 2001 From: Alexander Zielenski Date: Mon, 6 Mar 2023 15:18:21 -0800 Subject: [PATCH] fix scale not being given gvk in CRD openapi schemas relates to #116311 --- .../pkg/controller/openapi/builder/builder.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/builder/builder.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/builder/builder.go index b282b61b969..10cabfbbf72 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/builder/builder.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/builder/builder.go @@ -40,6 +40,7 @@ import ( "k8s.io/apiserver/pkg/endpoints" "k8s.io/apiserver/pkg/endpoints/openapi" utilopenapi "k8s.io/apiserver/pkg/util/openapi" + "k8s.io/client-go/kubernetes/scheme" openapibuilder "k8s.io/kube-openapi/pkg/builder" "k8s.io/kube-openapi/pkg/builder3" "k8s.io/kube-openapi/pkg/common" @@ -468,7 +469,7 @@ func withDescription(s spec.Schema, desc string) spec.Schema { } func generateBuildDefinitionsFunc() { - namer = openapi.NewDefinitionNamer(runtime.NewScheme()) + namer = openapi.NewDefinitionNamer(scheme.Scheme) definitionsV3 = utilopenapi.GetOpenAPIDefinitionsWithoutDisabledFeatures(generatedopenapi.GetOpenAPIDefinitions)(func(name string) spec.Ref { defName, _ := namer.GetDefinitionName(name) prefix := v3DefinitionPrefix