Skip to content

Commit 80d02d1

Browse files
authored
Fix openapi renderer (#621)
Signed-off-by: Tamal Saha <[email protected]>
1 parent ef36725 commit 80d02d1

File tree

2 files changed

+35
-1
lines changed

2 files changed

+35
-1
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ require (
4141
k8s.io/apiserver v0.32.2
4242
k8s.io/cli-runtime v0.32.2
4343
k8s.io/client-go v0.32.2
44+
k8s.io/component-base v0.32.2
4445
k8s.io/klog/v2 v2.130.1
4546
k8s.io/kube-aggregator v0.32.2
4647
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7
@@ -144,7 +145,6 @@ require (
144145
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
145146
gopkg.in/yaml.v2 v2.4.0 // indirect
146147
gopkg.in/yaml.v3 v3.0.1 // indirect
147-
k8s.io/component-base v0.32.2 // indirect
148148
k8s.io/kms v0.32.2 // indirect
149149
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
150150
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect

openapi/render.go

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,15 @@ 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"
2930
openapinamer "k8s.io/apiserver/pkg/endpoints/openapi"
3031
"k8s.io/apiserver/pkg/registry/rest"
3132
genericapiserver "k8s.io/apiserver/pkg/server"
3233
genericoptions "k8s.io/apiserver/pkg/server/options"
3334
clientgoinformers "k8s.io/client-go/informers"
3435
clientgoclientset "k8s.io/client-go/kubernetes"
3536
restclient "k8s.io/client-go/rest"
37+
utilversion "k8s.io/component-base/version"
3638
"k8s.io/klog/v2"
3739
"k8s.io/kube-openapi/pkg/builder"
3840
"k8s.io/kube-openapi/pkg/common"
@@ -117,6 +119,7 @@ func RenderOpenAPISpec(cfg Config) (string, error) {
117119
serverConfig.OpenAPIConfig.Info.InfoProps = cfg.Info
118120
serverConfig.OpenAPIV3Config = genericapiserver.DefaultOpenAPIV3Config(cfg.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(cfg.Scheme))
119121
serverConfig.OpenAPIV3Config.Info.InfoProps = cfg.Info
122+
serverConfig.EffectiveVersion = &effectiveVersion{}
120123

121124
genericServer, err := serverConfig.Complete().New("stash-server", genericapiserver.NewEmptyDelegate()) // completion is done in Complete, no need for a second time
122125
if err != nil {
@@ -278,3 +281,34 @@ func RenderOpenAPISpec(cfg Config) (string, error) {
278281
}
279282
return string(data), nil
280283
}
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)