github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

using BuildOpenAPISpecFromRoutes instead of deprecated BuildOpenAPISpec

Browse Source
This commit is contained in:
SataQiu 2023-02-06 17:47:44 +08:00
parent f3562d9dea
commit 5fbd49c102
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/builder/builder.go
View File

@ -43,6 +43,7 @@ import (
openapibuilder "k8s.io/kube-openapi/pkg/builder" openapibuilder "k8s.io/kube-openapi/pkg/builder"
"k8s.io/kube-openapi/pkg/builder3" "k8s.io/kube-openapi/pkg/builder3"
"k8s.io/kube-openapi/pkg/common" "k8s.io/kube-openapi/pkg/common"
"k8s.io/kube-openapi/pkg/common/restfuladapter"
"k8s.io/kube-openapi/pkg/spec3" "k8s.io/kube-openapi/pkg/spec3"
"k8s.io/kube-openapi/pkg/util" "k8s.io/kube-openapi/pkg/util"
"k8s.io/kube-openapi/pkg/validation/spec" "k8s.io/kube-openapi/pkg/validation/spec"
@ -199,7 +200,7 @@ func BuildOpenAPIV3(crd *apiextensionsv1.CustomResourceDefinition, version strin
return nil, err return nil, err
} }
return builder3.BuildOpenAPISpec([]*restful.WebService{b.ws}, b.getOpenAPIConfig(false)) return builder3.BuildOpenAPISpecFromRoutes(restfuladapter.AdaptWebServices([]*restful.WebService{b.ws}), b.getOpenAPIConfig(false))
} }
// BuildOpenAPIV2 builds OpenAPI v2 for the given crd in the given version // BuildOpenAPIV2 builds OpenAPI v2 for the given crd in the given version
@ -209,7 +210,7 @@ func BuildOpenAPIV2(crd *apiextensionsv1.CustomResourceDefinition, version strin
return nil, err return nil, err
} }
return openapibuilder.BuildOpenAPISpec([]*restful.WebService{b.ws}, b.getOpenAPIConfig(true)) return openapibuilder.BuildOpenAPISpecFromRoutes(restfuladapter.AdaptWebServices([]*restful.WebService{b.ws}), b.getOpenAPIConfig(true))
} }
// Implements CanonicalTypeNamer // Implements CanonicalTypeNamer

5
staging/src/k8s.io/apiserver/pkg/server/routes/openapi.go
View File

@ -24,6 +24,7 @@ import (
builder2 "k8s.io/kube-openapi/pkg/builder" builder2 "k8s.io/kube-openapi/pkg/builder"
"k8s.io/kube-openapi/pkg/builder3" "k8s.io/kube-openapi/pkg/builder3"
"k8s.io/kube-openapi/pkg/common" "k8s.io/kube-openapi/pkg/common"
"k8s.io/kube-openapi/pkg/common/restfuladapter"
"k8s.io/kube-openapi/pkg/handler" "k8s.io/kube-openapi/pkg/handler"
"k8s.io/kube-openapi/pkg/handler3" "k8s.io/kube-openapi/pkg/handler3"
"k8s.io/kube-openapi/pkg/validation/spec" "k8s.io/kube-openapi/pkg/validation/spec"
@ -36,7 +37,7 @@ type OpenAPI struct {
// Install adds the SwaggerUI webservice to the given mux. // Install adds the SwaggerUI webservice to the given mux.
func (oa OpenAPI) InstallV2(c *restful.Container, mux *mux.PathRecorderMux) (*handler.OpenAPIService, *spec.Swagger) { func (oa OpenAPI) InstallV2(c *restful.Container, mux *mux.PathRecorderMux) (*handler.OpenAPIService, *spec.Swagger) {
spec, err := builder2.BuildOpenAPISpec(c.RegisteredWebServices(), oa.Config) spec, err := builder2.BuildOpenAPISpecFromRoutes(restfuladapter.AdaptWebServices(c.RegisteredWebServices()), oa.Config)
if err != nil { if err != nil {
klog.Fatalf("Failed to build open api spec for root: %v", err) klog.Fatalf("Failed to build open api spec for root: %v", err)
} }
@ -75,7 +76,7 @@ func (oa OpenAPI) InstallV3(c *restful.Container, mux *mux.PathRecorderMux) *han
} }
for gv, ws := range grouped { for gv, ws := range grouped {
spec, err := builder3.BuildOpenAPISpec(ws, oa.Config) spec, err := builder3.BuildOpenAPISpecFromRoutes(restfuladapter.AdaptWebServices(ws), oa.Config)
if err != nil { if err != nil {
klog.Errorf("Failed to build OpenAPI v3 for group %s, %q", gv, err) klog.Errorf("Failed to build OpenAPI v3 for group %s, %q", gv, err)

3
staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/aggregator.go
View File

@ -32,6 +32,7 @@ import (
"k8s.io/kube-openapi/pkg/aggregator" "k8s.io/kube-openapi/pkg/aggregator"
"k8s.io/kube-openapi/pkg/builder" "k8s.io/kube-openapi/pkg/builder"
"k8s.io/kube-openapi/pkg/common" "k8s.io/kube-openapi/pkg/common"
"k8s.io/kube-openapi/pkg/common/restfuladapter"
"k8s.io/kube-openapi/pkg/handler" "k8s.io/kube-openapi/pkg/handler"
"k8s.io/kube-openapi/pkg/validation/spec" "k8s.io/kube-openapi/pkg/validation/spec"
) )
@ -81,7 +82,7 @@ func BuildAndRegisterAggregator(downloader *Downloader, delegationTarget server.
i := 0 i := 0
// Build Aggregator's spec // Build Aggregator's spec
aggregatorOpenAPISpec, err := builder.BuildOpenAPISpec(webServices, config) aggregatorOpenAPISpec, err := builder.BuildOpenAPISpecFromRoutes(restfuladapter.AdaptWebServices(webServices), config)
if err != nil { if err != nil {
return nil, err return nil, err
} }