From b5d9f2f3365be7b97bda5bb12ee6090ebc60712e Mon Sep 17 00:00:00 2001 From: Anirudh Date: Mon, 24 Oct 2016 17:15:39 -0700 Subject: [PATCH] Always run the podGC controller. --- cmd/kube-controller-manager/app/controllermanager.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index d7ab91c8a18..d532844bfba 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -271,11 +271,9 @@ func StartControllers(s *options.CMServer, kubeconfig *restclient.Config, rootCl ).Run(int(s.ConcurrentRCSyncs), wait.NeverStop) time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter)) - if s.TerminatedPodGCThreshold > 0 { - go podgc.NewPodGC(client("pod-garbage-collector"), sharedInformers.Pods().Informer(), - int(s.TerminatedPodGCThreshold)).Run(wait.NeverStop) - time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter)) - } + go podgc.NewPodGC(client("pod-garbage-collector"), sharedInformers.Pods().Informer(), + int(s.TerminatedPodGCThreshold)).Run(wait.NeverStop) + time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter)) cloud, err := cloudprovider.InitCloudProvider(s.CloudProvider, s.CloudConfigFile) if err != nil {