From c76620102517abc543b136a897432373ce6c4aab Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Tue, 7 Jan 2025 13:53:54 +0300 Subject: [PATCH] K8s/OpenAPI: remove unnecessary x-kubernetes-group-version-kind (#98578) --- pkg/services/apiserver/builder/openapi.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkg/services/apiserver/builder/openapi.go b/pkg/services/apiserver/builder/openapi.go index 0830af9838c..78089f44628 100644 --- a/pkg/services/apiserver/builder/openapi.go +++ b/pkg/services/apiserver/builder/openapi.go @@ -47,6 +47,7 @@ func getOpenAPIPostProcessor(version string, builders []APIGroupBuilder) func(*s if s.Paths == nil { return s, nil } + for _, b := range builders { gv := b.GetGroupVersion() prefix := "/apis/" + gv.String() + "/" @@ -65,6 +66,13 @@ func getOpenAPIPostProcessor(version string, builders []APIGroupBuilder) func(*s Paths: s.Paths, } + // Remove the growing list of kinds + for k, v := range copy.Components.Schemas { + if strings.HasPrefix(k, "io.k8s.apimachinery.pkg.apis.meta.v1") && v.Extensions != nil { + delete(v.Extensions, "x-kubernetes-group-version-kind") // a growing list of everything + } + } + // Optionally include raw http handlers provider, ok := b.(APIGroupRouteProvider) if ok && provider != nil { @@ -110,6 +118,7 @@ func getOpenAPIPostProcessor(version string, builders []APIGroupBuilder) func(*s return ©, nil } } + return s, nil } }