re-enable openapi aggregation

openshift · Jan 3, 2018 · e0476c3 · e0476c3
1 parent dc73150
commit e0476c3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/pkg/cmd/server/origin/aggregator.go b/pkg/cmd/server/origin/aggregator.go
@@ -48,7 +48,6 @@ func (c *MasterConfig) createAggregatorConfig(genericConfig genericapiserver.Con
 	// the aggregator doesn't wire these up.  It just delegates them to the kubeapiserver
 	genericConfig.EnableSwaggerUI = false
 	genericConfig.SwaggerConfig = nil
-	genericConfig.OpenAPIConfig = nil
 
 	// This depends on aggregator types being registered into the legacyscheme.Scheme, which is currently done in Start() to avoid concurrent scheme modification
 	// install our types into the scheme so that "normal" RESTOptionsGetters can work for us

diff --git a/test/integration/master_routes_test.go b/test/integration/master_routes_test.go
@@ -102,6 +102,7 @@ var expectedIndex = []string{
 	"/healthz/autoregister-completion",
 	"/healthz/etcd",
 	"/healthz/ping",
+	"/healthz/poststarthook/apiservice-openapi-controller",
 	"/healthz/poststarthook/apiservice-registration-controller",
 	"/healthz/poststarthook/apiservice-status-available-controller",
 	"/healthz/poststarthook/authorization.openshift.io-bootstrapclusterroles",