File tree Expand file tree Collapse file tree 1 file changed +5
-1
lines changed
staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -212,7 +212,11 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget)
212
212
return nil
213
213
})
214
214
s .GenericAPIServer .AddPostStartHookOrDie ("start-apiextensions-controllers" , func (context genericapiserver.PostStartHookContext ) error {
215
- if utilfeature .DefaultFeatureGate .Enabled (apiextensionsfeatures .CustomResourcePublishOpenAPI ) {
215
+ // OpenAPIVersionedService and StaticOpenAPISpec are populated in generic apiserver PrepareRun().
216
+ // Together they serve the /openapi/v2 endpoint on a generic apiserver. A generic apiserver may
217
+ // choose to not enable OpenAPI by having null openAPIConfig, and thus OpenAPIVersionedService
218
+ // and StaticOpenAPISpec are both null. In that case we don't run the CRD OpenAPI controller.
219
+ if utilfeature .DefaultFeatureGate .Enabled (apiextensionsfeatures .CustomResourcePublishOpenAPI ) && s .GenericAPIServer .OpenAPIVersionedService != nil && s .GenericAPIServer .StaticOpenAPISpec != nil {
216
220
go openapiController .Run (s .GenericAPIServer .StaticOpenAPISpec , s .GenericAPIServer .OpenAPIVersionedService , context .StopCh )
217
221
}
218
222
You can’t perform that action at this time.
0 commit comments