From 39316dfe9c9f3c857ac697d0336a828ca1c9c6d5 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Thu, 3 Aug 2017 16:46:05 +0200 Subject: [PATCH] apiextensions: fix panix with KUBE_API_VERSIONS set --- .../apiextensions-apiserver/pkg/apiserver/apiserver.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/apiserver.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/apiserver.go index 24778128fc..253f8523a5 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/apiserver.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/apiserver.go @@ -178,6 +178,11 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget) s.GenericAPIServer.Handler.NonGoRestfulMux.Handle("/apis", crdHandler) s.GenericAPIServer.Handler.NonGoRestfulMux.HandlePrefix("/apis/", crdHandler) + // this only happens when KUBE_API_VERSIONS is set. We must return without adding controllers or poststarthooks which would affect healthz + if crdClient == nil { + return s, nil + } + crdController := NewDiscoveryController(s.Informers.Apiextensions().InternalVersion().CustomResourceDefinitions(), versionDiscoveryHandler, groupDiscoveryHandler, c.GenericConfig.RequestContextMapper) namingController := status.NewNamingConditionController(s.Informers.Apiextensions().InternalVersion().CustomResourceDefinitions(), crdClient) finalizingController := finalizer.NewCRDFinalizer( @@ -186,11 +191,6 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget) crdHandler, ) - // this only happens when KUBE_API_VERSIONS is set. We must return without adding poststarthooks which would affect healthz - if crdClient == nil { - return s, nil - } - s.GenericAPIServer.AddPostStartHook("start-apiextensions-informers", func(context genericapiserver.PostStartHookContext) error { s.Informers.Start(context.StopCh) return nil