github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-21 09:57:52 +00:00
Code Issues 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

1
pkg/kubemark/BUILD
View File

@@ -17,7 +17,6 @@ go_library(
"//cmd/kube-proxy/app:go_default_library",
"//cmd/kubelet/app:go_default_library",
"//cmd/kubelet/app/options:go_default_library",
"//pkg/controller:go_default_library",
"//pkg/kubelet:go_default_library",
"//pkg/kubelet/apis/config:go_default_library",
"//pkg/kubelet/cadvisor:go_default_library",

3
pkg/kubemark/controller.go
View File

@@ -31,7 +31,6 @@ import (
kubeclient "k8s.io/client-go/kubernetes"
listersv1 "k8s.io/client-go/listers/core/v1"
"k8s.io/client-go/tools/cache"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/klog"
)
@@ -114,7 +113,7 @@ func NewKubemarkController(externalClient kubeclient.Interface, externalInformer
// WaitForCacheSync waits until all caches in the controller are populated.
func (kubemarkController *KubemarkController) WaitForCacheSync(stopCh chan struct{}) bool {
return controller.WaitForCacheSync("kubemark", stopCh,
return cache.WaitForNamedCacheSync("kubemark", stopCh,
kubemarkController.externalCluster.rcSynced,
kubemarkController.externalCluster.podSynced,
kubemarkController.kubemarkCluster.nodeSynced)