scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-12-01 22:03:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #121010 from Jefftree/decouple-openapi-v2v3-config

Browse Source 
Decouple openapi v2v3 config
This commit is contained in:
Kubernetes Prow Robot
2023-10-16 23:41:11 +02:00
committed by GitHub
parent bb16282831 e3098225ea
commit ac66f3d466
67 changed files with 242 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/integration/framework/controlplane_utils.go
View File

@@ -27,6 +27,7 @@ import (
"k8s.io/apiserver/pkg/storage/storagebackend"
utilopenapi "k8s.io/apiserver/pkg/util/openapi"
openapicommon "k8s.io/kube-openapi/pkg/common"
"k8s.io/kube-openapi/pkg/spec3"
"k8s.io/kube-openapi/pkg/validation/spec"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/generated/openapi"
@@ -63,7 +64,7 @@ func DefaultOpenAPIConfig() *openapicommon.Config {
}
// DefaultOpenAPIV3Config returns an openapicommon.Config initialized to default values.
func DefaultOpenAPIV3Config() *openapicommon.Config {
func DefaultOpenAPIV3Config() *openapicommon.OpenAPIV3Config {
openAPIConfig := genericapiserver.DefaultOpenAPIV3Config(openapi.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(legacyscheme.Scheme))
openAPIConfig.Info = &spec.Info{
InfoProps: spec.InfoProps{
@@ -71,8 +72,8 @@ func DefaultOpenAPIV3Config() *openapicommon.Config {
Version: "unversioned",
},
}
openAPIConfig.DefaultResponse = &spec.Response{
ResponseProps: spec.ResponseProps{
openAPIConfig.DefaultResponse = &spec3.Response{
ResponseProps: spec3.ResponseProps{
Description: "Default Response.",
},
}