Integration tests should use 'kubectl explain --output plaintext-open…

…apiv2' - OpenAPIV3 discovery of aggregate APIs seems to need a little more work in K8s 1.28
vmware-tanzu · Aug 25, 2023 · 35ad6a3 · 35ad6a3
1 parent a036ae7
commit 35ad6a3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/internal/concierge/server/server.go b/internal/concierge/server/server.go
@@ -228,8 +228,10 @@ func getAggregatedAPIServerConfig(
 	// `kubectl explain` to work for the Concierge's aggregated API resources.
 	serverConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(
 		conciergeopenapi.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(scheme))
+	// serverConfig.OpenAPIConfig.Info.InfoProps.Title = "Pinniped Concierge"
 	serverConfig.OpenAPIV3Config = genericapiserver.DefaultOpenAPIV3Config(
 		conciergeopenapi.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(scheme))
+	// serverConfig.OpenAPIV3Config.Info.InfoProps.Title = "Pinniped Concierge"
 	// 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
@@ -613,8 +613,10 @@ func getAggregatedAPIServerConfig(
 	// `kubectl explain` to work for the Supervisor's aggregated API resources.
 	serverConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(
 		supervisoropenapi.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(scheme))
+	// serverConfig.OpenAPIConfig.Info.InfoProps.Title = "Pinniped Supervisor"
 	serverConfig.OpenAPIV3Config = genericapiserver.DefaultOpenAPIV3Config(
 		supervisoropenapi.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(scheme))
+	// serverConfig.OpenAPIV3Config.Info.InfoProps.Title = "Pinniped Supervisor"
 	// Note that among other things, this ApplyTo() function copies
 	// `recommendedOptions.SecureServing.ServerCert.GeneratedCert` into
 	// `serverConfig.SecureServing.Cert` thus making `dynamicCertProvider`

diff --git a/test/integration/kube_api_discovery_test.go b/test/integration/kube_api_discovery_test.go
@@ -701,7 +701,7 @@ func runKubectlVersion(t *testing.T) {
 func runKubectlExplain(t *testing.T, resourceName string, apiVersion string) string {
 	t.Helper()
 	var stdOut, stdErr bytes.Buffer
-	cmd := exec.Command("kubectl", "explain", resourceName, "--api-version", apiVersion)
+	cmd := exec.Command("kubectl", "explain", resourceName, "--api-version", apiVersion, "--output", "plaintext-openapiv2")
 	t.Log("Running:", cmd.String())
 	cmd.Stdout = &stdOut
 	cmd.Stderr = &stdErr