Fix openapi schema generator (#571)

Signed-off-by: Tamal Saha <[email protected]>
kmodules · Dec 24, 2023 · a2c5c86 · a2c5c86
1 parent 4dccc95
commit a2c5c86
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/openapi/render.go b/openapi/render.go
@@ -115,6 +115,8 @@ func RenderOpenAPISpec(cfg Config) (string, error) {
 	}
 	serverConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(cfg.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(cfg.Scheme))
 	serverConfig.OpenAPIConfig.Info.InfoProps = cfg.Info
+	serverConfig.OpenAPIV3Config = genericapiserver.DefaultOpenAPIV3Config(cfg.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(cfg.Scheme))
+	serverConfig.OpenAPIV3Config.Info.InfoProps = cfg.Info
 
 	genericServer, err := serverConfig.Complete().New("stash-server", genericapiserver.NewEmptyDelegate()) // completion is done in Complete, no need for a second time
 	if err != nil {

diff --git a/openapi/std_storage.go b/openapi/std_storage.go
@@ -18,6 +18,7 @@ package openapi
 
 import (
 	"context"
+	"strings"
 
 	metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -35,6 +36,7 @@ var (
 	_ rest.GroupVersionKindProvider = &StandardStorage{}
 	_ rest.Scoper                   = &StandardStorage{}
 	_ rest.StandardStorage          = &StandardStorage{}
+	_ rest.SingularNameProvider     = &StandardStorage{}
 )
 
 func NewStandardStorage(cfg ResourceInfo) *StandardStorage {
@@ -45,6 +47,10 @@ func (r *StandardStorage) GroupVersionKind(containingGV schema.GroupVersion) sch
 	return r.cfg.gvk
 }
 
+func (r *StandardStorage) GetSingularName() string {
+	return strings.ToLower(r.cfg.gvk.Kind)
+}
+
 func (r *StandardStorage) NamespaceScoped() bool {
 	return r.cfg.namespaceScoped
 }