github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #81527 from yastij/move-controller-util

Browse Source 
move WaitForCacheSync to the sharedInformer package
This commit is contained in:
Kubernetes Prow Robot
2019-08-27 00:52:54 -07:00
committed by GitHub
parent ead8e0c24e 7e4c3096fe
commit 927f45191e
61 changed files with 72 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/controller/nodeipam/node_ipam_controller.go
View File

@@ -33,7 +33,6 @@ import (
clientset "k8s.io/client-go/kubernetes"
corelisters "k8s.io/client-go/listers/core/v1"
cloudprovider "k8s.io/cloud-provider"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/controller/nodeipam/ipam"
"k8s.io/kubernetes/pkg/util/metrics"
)
@@ -152,7 +151,7 @@ func (nc *Controller) Run(stopCh <-chan struct{}) {
klog.Infof("Starting ipam controller")
defer klog.Infof("Shutting down ipam controller")
if !controller.WaitForCacheSync("node", stopCh, nc.nodeInformerSynced) {
if !cache.WaitForNamedCacheSync("node", stopCh, nc.nodeInformerSynced) {
return
}