Skip to content

Commit 38a9e7b

Browse files
committed
Use NewEffectiveVersion
Signed-off-by: Tamal Saha <[email protected]>
1 parent 80d02d1 commit 38a9e7b

File tree

1 file changed

+5
-33
lines changed

1 file changed

+5
-33
lines changed

openapi/render.go

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
"k8s.io/apimachinery/pkg/runtime"
2727
"k8s.io/apimachinery/pkg/runtime/schema"
2828
"k8s.io/apimachinery/pkg/runtime/serializer"
29-
"k8s.io/apimachinery/pkg/util/version"
3029
openapinamer "k8s.io/apiserver/pkg/endpoints/openapi"
3130
"k8s.io/apiserver/pkg/registry/rest"
3231
genericapiserver "k8s.io/apiserver/pkg/server"
@@ -42,6 +41,10 @@ import (
4241
"k8s.io/kube-openapi/pkg/validation/spec"
4342
)
4443

44+
const (
45+
DefaultKubernetesVersion = "v1.32.2"
46+
)
47+
4548
type TypeInfo struct {
4649
GroupVersion schema.GroupVersion
4750
Resource string
@@ -119,7 +122,7 @@ func RenderOpenAPISpec(cfg Config) (string, error) {
119122
serverConfig.OpenAPIConfig.Info.InfoProps = cfg.Info
120123
serverConfig.OpenAPIV3Config = genericapiserver.DefaultOpenAPIV3Config(cfg.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(cfg.Scheme))
121124
serverConfig.OpenAPIV3Config.Info.InfoProps = cfg.Info
122-
serverConfig.EffectiveVersion = &effectiveVersion{}
125+
serverConfig.EffectiveVersion = utilversion.NewEffectiveVersion(DefaultKubernetesVersion)
123126

124127
genericServer, err := serverConfig.Complete().New("stash-server", genericapiserver.NewEmptyDelegate()) // completion is done in Complete, no need for a second time
125128
if err != nil {
@@ -281,34 +284,3 @@ func RenderOpenAPISpec(cfg Config) (string, error) {
281284
}
282285
return string(data), nil
283286
}
284-
285-
type effectiveVersion struct{}
286-
287-
var _ utilversion.EffectiveVersion = &effectiveVersion{}
288-
289-
func (e effectiveVersion) BinaryVersion() *version.Version {
290-
return version.MustParse("v1.32.2")
291-
}
292-
293-
func (e effectiveVersion) EmulationVersion() *version.Version {
294-
return version.MustParse("v1.32.2")
295-
}
296-
297-
func (e effectiveVersion) MinCompatibilityVersion() *version.Version {
298-
return version.MustParse("v1.32.2")
299-
}
300-
301-
func (e effectiveVersion) EqualTo(other utilversion.EffectiveVersion) bool {
302-
// TODO implement me
303-
panic("implement me")
304-
}
305-
306-
func (e effectiveVersion) String() string {
307-
// TODO implement me
308-
panic("implement me")
309-
}
310-
311-
func (e effectiveVersion) Validate() []error {
312-
// TODO implement me
313-
panic("implement me")
314-
}

0 commit comments

Comments
 (0)