github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #39394 from wlan0/master

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 39394, 38270, 39473, 39516, 36243)

make private method private

@thockin
This commit is contained in:
Kubernetes Submit Queue 2017-01-09 12:05:17 -08:00 committed by GitHub
commit 73d36ce587
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/cloud-controller-manager/app/controllermanager.go
View File

@ -70,8 +70,8 @@ the cloud specific control loops shipped with Kubernetes.`,
return cmd return cmd
} }
// ResyncPeriod computes the time interval a shared informer waits before resyncing with the api server // resyncPeriod computes the time interval a shared informer waits before resyncing with the api server
func ResyncPeriod(s *options.CloudControllerManagerServer) func() time.Duration { func resyncPeriod(s *options.CloudControllerManagerServer) func() time.Duration {
return func() time.Duration { return func() time.Duration {
factor := rand.Float64() + 1 factor := rand.Float64() + 1
return time.Duration(float64(s.MinResyncPeriod.Nanoseconds()) * factor) return time.Duration(float64(s.MinResyncPeriod.Nanoseconds()) * factor)
@ -191,7 +191,7 @@ func StartControllers(s *options.CloudControllerManagerServer, kubeconfig *restc
client := func(serviceAccountName string) clientset.Interface { client := func(serviceAccountName string) clientset.Interface {
return rootClientBuilder.ClientOrDie(serviceAccountName) return rootClientBuilder.ClientOrDie(serviceAccountName)
} }
sharedInformers := informers.NewSharedInformerFactory(client("shared-informers"), nil, ResyncPeriod(s)()) sharedInformers := informers.NewSharedInformerFactory(client("shared-informers"), nil, resyncPeriod(s)())
_, clusterCIDR, err := net.ParseCIDR(s.ClusterCIDR) _, clusterCIDR, err := net.ParseCIDR(s.ClusterCIDR)
if err != nil { if err != nil {