kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update kubernetes code for minor API changes to kube-openapi 

Kubernetes-commit: 88ec8fba32f0ef7b768ec528cfbe44046877ea34
This commit is contained in:
Antoine Pelisse 2022-12-29 12:12:33 -08:00 committed by Kubernetes Publisher
parent 2f34b8f267
commit f42dbf07d0
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
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)
} }