DO NOT MERGE: SUPER HACK TO ADD OpenAPIV3Config TO AGGREGATE API

vmware-tanzu · Aug 22, 2023 · ca19553 · ca19553
1 parent 1de354f
commit ca19553
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/internal/concierge/server/server.go b/internal/concierge/server/server.go
@@ -228,6 +228,8 @@ func getAggregatedAPIServerConfig(
 	// `kubectl explain` to work for the Concierge's aggregated API resources.
 	serverConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(
 		conciergeopenapi.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(scheme))
+	serverConfig.OpenAPIV3Config = genericapiserver.DefaultOpenAPIV3Config(
+		conciergeopenapi.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(scheme))
 	// Note that among other things, this ApplyTo() function copies
 	// `recommendedOptions.SecureServing.ServerCert.GeneratedCert` into
 	// `serverConfig.SecureServing.Cert` thus making `dynamicCertProvider`

diff --git a/internal/supervisor/server/server.go b/internal/supervisor/server/server.go
@@ -1,4 +1,4 @@
-// Copyright 2020-2022 the Pinniped contributors. All Rights Reserved.
+// Copyright 2020-2023 the Pinniped contributors. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 // Package server defines the entrypoint for the Pinniped Supervisor server.
@@ -613,6 +613,8 @@ func getAggregatedAPIServerConfig(
 	// `kubectl explain` to work for the Supervisor's aggregated API resources.
 	serverConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(
 		supervisoropenapi.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(scheme))
+	serverConfig.OpenAPIV3Config = genericapiserver.DefaultOpenAPIV3Config(
+		supervisoropenapi.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(scheme))
 	// Note that among other things, this ApplyTo() function copies
 	// `recommendedOptions.SecureServing.ServerCert.GeneratedCert` into
 	// `serverConfig.SecureServing.Cert` thus making `dynamicCertProvider`