Use existing OpenAPIV3Config functions

vshn · Jul 9, 2024 · 62c720c · 62c720c
1 parent 8cd3ef1
commit 62c720c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/go.mod b/go.mod
@@ -4,8 +4,6 @@ module sigs.k8s.io/apiserver-runtime
 
 go 1.22.0
 
-toolchain go1.22.5
-
 require (
 	github.com/golangci/golangci-lint v1.50.1
 	github.com/google/gofuzz v1.2.0

diff --git a/internal/sample-apiserver/pkg/cmd/server/ext.go b/internal/sample-apiserver/pkg/cmd/server/ext.go
@@ -60,6 +60,10 @@ func SetOpenAPIDefinitions(name, version string, defs openapicommon.GetOpenAPIDe
 		config.OpenAPIConfig = pkgserver.DefaultOpenAPIConfig(defs, openapi.NewDefinitionNamer(apiserver.Scheme))
 		config.OpenAPIConfig.Info.Title = name
 		config.OpenAPIConfig.Info.Version = version
+
+		config.OpenAPIV3Config = pkgserver.DefaultOpenAPIV3Config(defs, openapi.NewDefinitionNamer(apiserver.Scheme))
+		config.OpenAPIV3Config.Info.Title = name
+		config.OpenAPIV3Config.Info.Version = version
 		return config
 	})
 }

diff --git a/internal/sample-apiserver/pkg/cmd/server/start.go b/internal/sample-apiserver/pkg/cmd/server/start.go
@@ -24,11 +24,9 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
-	"k8s.io/apiserver/pkg/endpoints/openapi"
 	genericapiserver "k8s.io/apiserver/pkg/server"
 	genericoptions "k8s.io/apiserver/pkg/server/options"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
-	sampleopenapi "k8s.io/sample-apiserver/pkg/generated/openapi"
 	"sigs.k8s.io/apiserver-runtime/internal/sample-apiserver/pkg/apiserver"
 )
 
@@ -139,13 +137,13 @@ func (o *WardleServerOptions) Config() (*apiserver.Config, error) {
 	// change: apiserver-runtime
 	// OpenAPIConfig set through ApplyRecommendedConfigFns by calling SetOpenAPIDefinitions
 	//
-	serverConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(sampleopenapi.GetOpenAPIDefinitions, openapi.NewDefinitionNamer(apiserver.Scheme))
-	serverConfig.OpenAPIConfig.Info.Title = "Wardle"
-	serverConfig.OpenAPIConfig.Info.Version = "0.1"
+	// serverConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(sampleopenapi.GetOpenAPIDefinitions, openapi.NewDefinitionNamer(apiserver.Scheme))
+	// serverConfig.OpenAPIConfig.Info.Title = "Wardle"
+	// serverConfig.OpenAPIConfig.Info.Version = "0.1"
 
-	serverConfig.OpenAPIV3Config = genericapiserver.DefaultOpenAPIV3Config(sampleopenapi.GetOpenAPIDefinitions, openapi.NewDefinitionNamer(apiserver.Scheme))
-	serverConfig.OpenAPIV3Config.Info.Title = "Wardle"
-	serverConfig.OpenAPIV3Config.Info.Version = "0.1"
+	// serverConfig.OpenAPIV3Config = genericapiserver.DefaultOpenAPIV3Config(sampleopenapi.GetOpenAPIDefinitions, openapi.NewDefinitionNamer(apiserver.Scheme))
+	// serverConfig.OpenAPIV3Config.Info.Title = "Wardle"
+	// serverConfig.OpenAPIV3Config.Info.Version = "0.1"
 
 	if err := o.RecommendedOptions.ApplyTo(serverConfig); err != nil {
 		return nil, err