Merge pull request kubernetes#90882 from RainbowMango/pr_switch_deprecated_RegisterOpenAPIVersionedService

k8s-ci-robot · web-flow · commit 3446ffbb4a53 · 2020-05-09T12:02:13.000-07:00
Switch deprecated RegisterOpenAPIVersionedService function
diff --git a/staging/src/k8s.io/apiserver/pkg/server/routes/openapi.go b/staging/src/k8s.io/apiserver/pkg/server/routes/openapi.go
@@ -38,9 +38,16 @@ func (oa OpenAPI) Install(c *restful.Container, mux *mux.PathRecorderMux) (*hand
 	if err != nil {
 		klog.Fatalf("Failed to build open api spec for root: %v", err)
 	}
-	openAPIVersionedService, err := handler.RegisterOpenAPIVersionedService(spec, "/openapi/v2", mux)
+
+	openAPIVersionedService, err := handler.NewOpenAPIService(spec)
+	if err != nil {
+		klog.Fatalf("Failed to create OpenAPIService: %v", err)
+	}
+
+	err = openAPIVersionedService.RegisterOpenAPIVersionedService("/openapi/v2", mux)
 	if err != nil {
 		klog.Fatalf("Failed to register versioned open api spec for root: %v", err)
 	}
+
 	return openAPIVersionedService, spec
 }

Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,16 @@ func (oa OpenAPI) Install(c restful.Container, mux mux.PathRecorderMux) (*hand`
`38`	`38`	`if err != nil {`
`39`	`39`	`klog.Fatalf("Failed to build open api spec for root: %v", err)`
`40`	`40`	`}`
`41`		`- openAPIVersionedService, err := handler.RegisterOpenAPIVersionedService(spec, "/openapi/v2", mux)`
	`41`	`+`
	`42`	`+ openAPIVersionedService, err := handler.NewOpenAPIService(spec)`
	`43`	`+ if err != nil {`
	`44`	`+ klog.Fatalf("Failed to create OpenAPIService: %v", err)`
	`45`	`+ }`
	`46`	`+`
	`47`	`+ err = openAPIVersionedService.RegisterOpenAPIVersionedService("/openapi/v2", mux)`
`42`	`48`	`if err != nil {`
`43`	`49`	`klog.Fatalf("Failed to register versioned open api spec for root: %v", err)`
`44`	`50`	`}`
	`51`	`+`
`45`	`52`	`return openAPIVersionedService, spec`
`46`	`53`	`}`