diff --git a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go index a6fc410285c0..71ff16d1ff21 100644 --- a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go +++ b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go @@ -157,11 +157,7 @@ func Run(s *options.CMServer) error { glog.Fatalf("error starting controllers: %v", err) } - if StartInformers == nil { - ctx.InformerFactory.Start(ctx.Stop) - } else { - StartInformers(ctx.Stop) - } + ctx.InformerFactory.Start(ctx.Stop) close(ctx.InformersStarted) select {} diff --git a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/patch.go b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/patch.go index 02ce021eee48..4accfb3e464a 100644 --- a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/patch.go +++ b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/patch.go @@ -7,6 +7,3 @@ import ( // This allows overriding from inside the same process. It's not pretty, but its fairly easy to maintain because conflicts are small. var CreateControllerContext func(s *options.CMServer, rootClientBuilder, clientBuilder controller.ControllerClientBuilder, stop <-chan struct{}) (ControllerContext, error) = createControllerContext - -// StartInformers allows overriding inside of the same process. -var StartInformers func(stop <-chan struct{}) = nil