From cc4d98920042798a039b8130520a728e42c61757 Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Thu, 4 Jan 2024 01:42:12 -0800 Subject: [PATCH] Configure openapiv3 Signed-off-by: Tamal Saha --- pkg/cmds/server/start.go | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/pkg/cmds/server/start.go b/pkg/cmds/server/start.go index 3fa86dbb0a..10d0fce619 100644 --- a/pkg/cmds/server/start.go +++ b/pkg/cmds/server/start.go @@ -128,16 +128,7 @@ func (o *UIServerOptions) Config() (*apiserver.Config, error) { // Fixes https://github.com/Azure/AKS/issues/522 clientcmd.Fix(serverConfig.ClientConfig) - serverConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig( - ou.GetDefinitions( - auditorv1alpha1.GetOpenAPIDefinitions, - identityv1alpha1.GetOpenAPIDefinitions, - rscoreapi.GetOpenAPIDefinitions, - ), - openapi.NewDefinitionNamer(apiserver.Scheme)) - serverConfig.OpenAPIConfig.Info.Title = "kube-ui-server" - serverConfig.OpenAPIConfig.Info.Version = v.Version.Version - serverConfig.OpenAPIConfig.IgnorePrefixes = []string{ + ignorePrefixes := []string{ "/swaggerapi", fmt.Sprintf("/apis/%s/%s", auditorv1alpha1.SchemeGroupVersion, auditorv1alpha1.ResourceSiteInfos), @@ -170,6 +161,28 @@ func (o *UIServerOptions) Config() (*apiserver.Config, error) { fmt.Sprintf("/apis/%s/%s", rscoreapi.SchemeGroupVersion, rscoreapi.ResourceProjects), } + serverConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig( + ou.GetDefinitions( + auditorv1alpha1.GetOpenAPIDefinitions, + identityv1alpha1.GetOpenAPIDefinitions, + rscoreapi.GetOpenAPIDefinitions, + ), + openapi.NewDefinitionNamer(apiserver.Scheme)) + serverConfig.OpenAPIConfig.Info.Title = "kube-ui-server" + serverConfig.OpenAPIConfig.Info.Version = v.Version.Version + serverConfig.OpenAPIConfig.IgnorePrefixes = ignorePrefixes + + serverConfig.OpenAPIV3Config = genericapiserver.DefaultOpenAPIV3Config( + ou.GetDefinitions( + auditorv1alpha1.GetOpenAPIDefinitions, + identityv1alpha1.GetOpenAPIDefinitions, + rscoreapi.GetOpenAPIDefinitions, + ), + openapi.NewDefinitionNamer(apiserver.Scheme)) + serverConfig.OpenAPIV3Config.Info.Title = "kube-ui-server" + serverConfig.OpenAPIV3Config.Info.Version = v.Version.Version + serverConfig.OpenAPIV3Config.IgnorePrefixes = ignorePrefixes + extraConfig := apiserver.ExtraConfig{ ClientConfig: serverConfig.ClientConfig, PromConfig: *o.PrometheusOptions,