Skip to content

Commit

Permalink
Use NewEffectiveVersion
Browse files Browse the repository at this point in the history
Signed-off-by: Tamal Saha <[email protected]>
  • Loading branch information
tamalsaha committed Mar 8, 2025
1 parent 80d02d1 commit 38a9e7b
Showing 1 changed file with 5 additions and 33 deletions.
38 changes: 5 additions & 33 deletions openapi/render.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/apimachinery/pkg/util/version"
openapinamer "k8s.io/apiserver/pkg/endpoints/openapi"
"k8s.io/apiserver/pkg/registry/rest"
genericapiserver "k8s.io/apiserver/pkg/server"
Expand All @@ -42,6 +41,10 @@ import (
"k8s.io/kube-openapi/pkg/validation/spec"
)

const (
DefaultKubernetesVersion = "v1.32.2"
)

type TypeInfo struct {
GroupVersion schema.GroupVersion
Resource string
Expand Down Expand Up @@ -119,7 +122,7 @@ func RenderOpenAPISpec(cfg Config) (string, error) {
serverConfig.OpenAPIConfig.Info.InfoProps = cfg.Info
serverConfig.OpenAPIV3Config = genericapiserver.DefaultOpenAPIV3Config(cfg.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(cfg.Scheme))
serverConfig.OpenAPIV3Config.Info.InfoProps = cfg.Info
serverConfig.EffectiveVersion = &effectiveVersion{}
serverConfig.EffectiveVersion = utilversion.NewEffectiveVersion(DefaultKubernetesVersion)

genericServer, err := serverConfig.Complete().New("stash-server", genericapiserver.NewEmptyDelegate()) // completion is done in Complete, no need for a second time
if err != nil {
Expand Down Expand Up @@ -281,34 +284,3 @@ func RenderOpenAPISpec(cfg Config) (string, error) {
}
return string(data), nil
}

type effectiveVersion struct{}

var _ utilversion.EffectiveVersion = &effectiveVersion{}

func (e effectiveVersion) BinaryVersion() *version.Version {
return version.MustParse("v1.32.2")
}

func (e effectiveVersion) EmulationVersion() *version.Version {
return version.MustParse("v1.32.2")
}

func (e effectiveVersion) MinCompatibilityVersion() *version.Version {
return version.MustParse("v1.32.2")
}

func (e effectiveVersion) EqualTo(other utilversion.EffectiveVersion) bool {
// TODO implement me
panic("implement me")
}

func (e effectiveVersion) String() string {
// TODO implement me
panic("implement me")
}

func (e effectiveVersion) Validate() []error {
// TODO implement me
panic("implement me")
}

0 comments on commit 38a9e7b

Please sign in to comment.