github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Signature fix for registeropenapi

Browse Source
This commit is contained in:
Jefftree
2023-05-24 18:56:04 +00:00
parent 4373ae05f3
commit 27057def05
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,10 +43,7 @@ func (oa OpenAPI) InstallV2(c *restful.Container, mux *mux.PathRecorderMux) (*ha
}
spec.Definitions = handler.PruneDefaults(spec.Definitions)
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)
}
openAPIVersionedService.RegisterOpenAPIVersionedService("/openapi/v2", mux)
return openAPIVersionedService, spec
}

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

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