From 88ec8fba32f0ef7b768ec528cfbe44046877ea34 Mon Sep 17 00:00:00 2001 From: Antoine Pelisse Date: Thu, 29 Dec 2022 12:12:33 -0800 Subject: [PATCH] Update kubernetes code for minor API changes to kube-openapi --- .../k8s.io/apiserver/pkg/server/routes/openapi.go | 14 +++----------- .../client-go/util/testing/fake_openapi_handler.go | 8 ++------ .../controllers/openapi/aggregator/aggregator.go | 5 +---- .../controllers/openapiv3/aggregator/aggregator.go | 5 +---- 4 files changed, 7 insertions(+), 25 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/server/routes/openapi.go b/staging/src/k8s.io/apiserver/pkg/server/routes/openapi.go index 794102d7b96..17cc1f85a09 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/routes/openapi.go +++ b/staging/src/k8s.io/apiserver/pkg/server/routes/openapi.go @@ -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) } spec.Definitions = handler.PruneDefaults(spec.Definitions) - openAPIVersionedService, err := handler.NewOpenAPIService(spec) - if err != nil { - klog.Fatalf("Failed to create OpenAPIService: %v", err) - } - + openAPIVersionedService := handler.NewOpenAPIService(spec) err = openAPIVersionedService.RegisterOpenAPIVersionedService("/openapi/v2", mux) if err != nil { 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 func (oa OpenAPI) InstallV3(c *restful.Container, mux *mux.PathRecorderMux) *handler3.OpenAPIService { - openAPIVersionedService, err := handler3.NewOpenAPIService(nil) - if err != nil { - klog.Fatalf("Failed to create OpenAPIService: %v", err) - } - - err = openAPIVersionedService.RegisterOpenAPIV3VersionedService("/openapi/v3", mux) + openAPIVersionedService := handler3.NewOpenAPIService() + err := openAPIVersionedService.RegisterOpenAPIV3VersionedService("/openapi/v3", mux) if err != nil { klog.Fatalf("Failed to register versioned open api spec for root: %v", err) } diff --git a/staging/src/k8s.io/client-go/util/testing/fake_openapi_handler.go b/staging/src/k8s.io/client-go/util/testing/fake_openapi_handler.go index b957b420e1c..a7b0d590bb3 100644 --- a/staging/src/k8s.io/client-go/util/testing/fake_openapi_handler.go +++ b/staging/src/k8s.io/client-go/util/testing/fake_openapi_handler.go @@ -50,12 +50,8 @@ func NewFakeOpenAPIV3Server(specsPath string) (*FakeOpenAPIServer, error) { } server := httptest.NewServer(mux) - openAPIVersionedService, err := handler3.NewOpenAPIService(nil) - if err != nil { - return nil, err - } - - err = openAPIVersionedService.RegisterOpenAPIV3VersionedService("/openapi/v3", mux) + openAPIVersionedService := handler3.NewOpenAPIService() + err := openAPIVersionedService.RegisterOpenAPIV3VersionedService("/openapi/v3", mux) if err != nil { return nil, err } diff --git a/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/aggregator.go b/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/aggregator.go index a7c18533056..29d085a23ea 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/aggregator.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/aggregator.go @@ -127,10 +127,7 @@ func BuildAndRegisterAggregator(downloader *Downloader, delegationTarget server. } // Install handler - s.openAPIVersionedService, err = handler.NewOpenAPIService(specToServe) - if err != nil { - return nil, err - } + s.openAPIVersionedService = handler.NewOpenAPIService(specToServe) err = s.openAPIVersionedService.RegisterOpenAPIVersionedService("/openapi/v2", pathHandler) if err != nil { return nil, err diff --git a/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapiv3/aggregator/aggregator.go b/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapiv3/aggregator/aggregator.go index 67e793077e9..8f4edffc595 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapiv3/aggregator/aggregator.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapiv3/aggregator/aggregator.go @@ -93,10 +93,7 @@ func BuildAndRegisterAggregator(downloader Downloader, delegationTarget server.D i++ } - handler, err := handler3.NewOpenAPIService(nil) - if err != nil { - return s, err - } + handler := handler3.NewOpenAPIService() s.openAPIV2ConverterHandler = handler openAPIV2ConverterMux := mux.NewPathRecorderMux(openAPIV2Converter) s.openAPIV2ConverterHandler.RegisterOpenAPIV3VersionedService("/openapi/v3", openAPIV2ConverterMux)