Merge pull request #55561 from oracle/for/upstream/master/55560

Automatic merge from submit-queue (batch tested with PRs 55561, 55519). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Add the concurrent service sync flag to CCM to match the KCM **What this PR does / why we need it**: The [KCM](https://github.com/kubernetes/kubernetes/blob/master/cmd/kube-controller-manager/app/options/options.go#L140) allows changing the number of workers for the service controller, but the CCM does not currently expose that flag. This PR adds the same flag as the KCM to the CCM. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #55560 **Release note**: ```release-note Add the concurrent service sync flag to the Cloud Controller Manager to allow changing the number of workers. (`--concurrent-service-syncs`) ``` /cc @wlan0 @luxas @thockin @prydie

Merge pull request #55561 from oracle/for/upstream/master/55560
6f59b318 · Kubernetes Submit Queue · GitHub · bfe581d9 · a1fddf48 · 6f59b318
Unverified Commit 6f59b318 authored Nov 12, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 12, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

options.go cmd/cloud-controller-manager/app/options/options.go +1 -1

No files found.
--- a/cmd/cloud-controller-manager/app/options/options.go
+++ b/cmd/cloud-controller-manager/app/options/options.go
@@ -97,7 +97,7 @@ func (s *CloudControllerManagerServer) AddFlags(fs *pflag.FlagSet) {
 	fs.Float32Var(&s.KubeAPIQPS, "kube-api-qps", s.KubeAPIQPS, "QPS to use while talking with kubernetes apiserver.")
 	fs.Int32Var(&s.KubeAPIBurst, "kube-api-burst", s.KubeAPIBurst, "Burst to use while talking with kubernetes apiserver.")
 	fs.DurationVar(&s.ControllerStartInterval.Duration, "controller-start-interval", s.ControllerStartInterval.Duration, "Interval between starting controller managers.")
+	fs.Int32Var(&s.ConcurrentServiceSyncs, "concurrent-service-syncs", s.ConcurrentServiceSyncs, "The number of services that are allowed to sync concurrently. Larger number = more responsive service management, but more CPU (and network) load")
 	leaderelectionconfig.BindFlags(&s.LeaderElection, fs)
 	utilfeature.DefaultFeatureGate.AddFlag(fs)