Skip to content

K
k3s
Commit a4b7100c authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #52007 from oracle/for/upstream/master/ccm-sa-run-jitter

Automatic merge from submit-queue (batch tested with PRs 52007, 52196, 52169, 52263, 52291) Fixed CCM service controller start jitter **What this PR does / why we need it**: The start jitter for the service controller was running regardless if the service controller was being ran. This should help startup time for CCM's without the service controller implementation. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` /cc @wlan0 @andrewsykim @luxas @jhorwit2 /area cloudprovider /sig cluster-lifecycle
parents 13b9c9af b286f9fd
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
cmd/cloud-controller-manager/app/controllermanager.go
View file @ a4b7100c
...@@ -215,8 +215,8 @@ func StartControllers(s *options.CloudControllerManagerServer, kubeconfig *restc ...@@ -215,8 +215,8 @@ func StartControllers(s *options.CloudControllerManagerServer, kubeconfig *restc
glog.Errorf("Failed to start service controller: %v", err) glog.Errorf("Failed to start service controller: %v", err)
} else { } else {
go serviceController.Run(stop, int(s.ConcurrentServiceSyncs)) go serviceController.Run(stop, int(s.ConcurrentServiceSyncs))
time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter))
} }
time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter))
// If CIDRs should be allocated for pods and set on the CloudProvider, then start the route controller // If CIDRs should be allocated for pods and set on the CloudProvider, then start the route controller
if s.AllocateNodeCIDRs && s.ConfigureCloudRoutes { if s.AllocateNodeCIDRs && s.ConfigureCloudRoutes {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment