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

Update kubernetes code for minor API changes to kube-openapi

Browse Source
This commit is contained in:
Antoine Pelisse 2022-12-29 12:12:33 -08:00
parent 9bbdb9f130
commit 88ec8fba32
4 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,11 +42,7 @@ func (oa OpenAPI) InstallV2(c *restful.Container, mux *mux.PathRecorderMux) (*ha
klog.Fatalf("Failed to build open api spec for root: %v", err) klog.Fatalf("Failed to build open api spec for root: %v", err)
} }
spec.Definitions = handler.PruneDefaults(spec.Definitions) spec.Definitions = handler.PruneDefaults(spec.Definitions)
openAPIVersionedService, err := handler.NewOpenAPIService(spec) openAPIVersionedService := handler.NewOpenAPIService(spec)
if err != nil {
klog.Fatalf("Failed to create OpenAPIService: %v", err)
}
err = openAPIVersionedService.RegisterOpenAPIVersionedService("/openapi/v2", mux) err = openAPIVersionedService.RegisterOpenAPIVersionedService("/openapi/v2", mux)
if err != nil { if err != nil {
klog.Fatalf("Failed to register versioned open api spec for root: %v", err) klog.Fatalf("Failed to register versioned open api spec for root: %v", err)
@ -57,12 +53,8 @@ func (oa OpenAPI) InstallV2(c *restful.Container, mux *mux.PathRecorderMux) (*ha
// InstallV3 adds the static group/versions defined in the RegisteredWebServices to the OpenAPI v3 spec // InstallV3 adds the static group/versions defined in the RegisteredWebServices to the OpenAPI v3 spec
func (oa OpenAPI) InstallV3(c *restful.Container, mux *mux.PathRecorderMux) *handler3.OpenAPIService { func (oa OpenAPI) InstallV3(c *restful.Container, mux *mux.PathRecorderMux) *handler3.OpenAPIService {
openAPIVersionedService, err := handler3.NewOpenAPIService(nil) openAPIVersionedService := handler3.NewOpenAPIService()
if err != nil { err := openAPIVersionedService.RegisterOpenAPIV3VersionedService("/openapi/v3", mux)
klog.Fatalf("Failed to create OpenAPIService: %v", err)
}
err = openAPIVersionedService.RegisterOpenAPIV3VersionedService("/openapi/v3", mux)
if err != nil { if err != nil {
klog.Fatalf("Failed to register versioned open api spec for root: %v", err) klog.Fatalf("Failed to register versioned open api spec for root: %v", err)
} }

8
staging/src/k8s.io/client-go/util/testing/fake_openapi_handler.go
View File

@ -50,12 +50,8 @@ func NewFakeOpenAPIV3Server(specsPath string) (*FakeOpenAPIServer, error) {
} }
server := httptest.NewServer(mux) server := httptest.NewServer(mux)
openAPIVersionedService, err := handler3.NewOpenAPIService(nil) openAPIVersionedService := handler3.NewOpenAPIService()
if err != nil { err := openAPIVersionedService.RegisterOpenAPIV3VersionedService("/openapi/v3", mux)
return nil, err
}
err = openAPIVersionedService.RegisterOpenAPIV3VersionedService("/openapi/v3", mux)
if err != nil { if err != nil {
return nil, err return nil, err
} }

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

@ -127,10 +127,7 @@ func BuildAndRegisterAggregator(downloader *Downloader, delegationTarget server.
} }
// Install handler // Install handler
s.openAPIVersionedService, err = handler.NewOpenAPIService(specToServe) s.openAPIVersionedService = handler.NewOpenAPIService(specToServe)
if err != nil {
return nil, err
}
err = s.openAPIVersionedService.RegisterOpenAPIVersionedService("/openapi/v2", pathHandler) err = s.openAPIVersionedService.RegisterOpenAPIVersionedService("/openapi/v2", pathHandler)
if err != nil { if err != nil {
return nil, err return nil, err

5
staging/src/k8s.io/kube-aggregator/pkg/controllers/openapiv3/aggregator/aggregator.go
View File

@ -93,10 +93,7 @@ func BuildAndRegisterAggregator(downloader Downloader, delegationTarget server.D
i++ i++
} }
handler, err := handler3.NewOpenAPIService(nil) handler := handler3.NewOpenAPIService()
if err != nil {
return s, err
}
s.openAPIV2ConverterHandler = handler s.openAPIV2ConverterHandler = handler
openAPIV2ConverterMux := mux.NewPathRecorderMux(openAPIV2Converter) openAPIV2ConverterMux := mux.NewPathRecorderMux(openAPIV2Converter)
s.openAPIV2ConverterHandler.RegisterOpenAPIV3VersionedService("/openapi/v3", openAPIV2ConverterMux) s.openAPIV2ConverterHandler.RegisterOpenAPIV3VersionedService("/openapi/v3", openAPIV2ConverterMux)