Merge pull request #28340 from ZTE-PaaS/zhangke-patch-007

Automatic merge from submit-queue

controller-manager support number of garbage collector workers to be configurable

The number of garbage collector workers of controller-manager is a fixed value 5 now, make it configurable should more properly
This commit is contained in:
k8s-merge-robot
2016-07-13 12:54:15 -07:00
committed by GitHub
5 changed files with 427 additions and 380 deletions

View File

@@ -466,7 +466,7 @@ func StartControllers(s *options.CMServer, kubeClient *client.Client, kubeconfig
glog.Errorf("Failed to start the generic garbage collector")
} else {
// TODO: make this a flag of kube-controller-manager
workers := 5
workers := int(s.ConcurrentGCSyncs)
go garbageCollector.Run(workers, wait.NeverStop)
}
}