github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-20 01:23:48 +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/controller/podautoscaler/BUILD
View File

@@ -78,6 +78,7 @@ go_test(
"//staging/src/k8s.io/client-go/rest:go_default_library",
"//staging/src/k8s.io/client-go/scale/fake:go_default_library",
"//staging/src/k8s.io/client-go/testing:go_default_library",
"//staging/src/k8s.io/client-go/tools/cache:go_default_library",
"//staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta2:go_default_library",
"//staging/src/k8s.io/metrics/pkg/apis/external_metrics/v1beta1:go_default_library",
"//staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1:go_default_library",

2
pkg/controller/podautoscaler/horizontal.go
View File

@@ -156,7 +156,7 @@ func (a *HorizontalController) Run(stopCh <-chan struct{}) {
klog.Infof("Starting HPA controller")
defer klog.Infof("Shutting down HPA controller")
if !controller.WaitForCacheSync("HPA", stopCh, a.hpaListerSynced, a.podListerSynced) {
if !cache.WaitForNamedCacheSync("HPA", stopCh, a.hpaListerSynced, a.podListerSynced) {
return
}

3
pkg/controller/podautoscaler/legacy_replica_calculator_test.go
View File

@@ -33,6 +33,7 @@ import (
"k8s.io/client-go/kubernetes/fake"
restclient "k8s.io/client-go/rest"
core "k8s.io/client-go/testing"
"k8s.io/client-go/tools/cache"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/controller/podautoscaler/metrics"
@@ -196,7 +197,7 @@ func (tc *legacyReplicaCalcTestCase) runTest(t *testing.T) {
stop := make(chan struct{})
defer close(stop)
informerFactory.Start(stop)
if !controller.WaitForCacheSync("HPA", stop, informer.Informer().HasSynced) {
if !cache.WaitForNamedCacheSync("HPA", stop, informer.Informer().HasSynced) {
return
}

3
pkg/controller/podautoscaler/replica_calculator_test.go
View File

@@ -34,6 +34,7 @@ import (
"k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes/fake"
core "k8s.io/client-go/testing"
"k8s.io/client-go/tools/cache"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/controller"
metricsclient "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics"
@@ -349,7 +350,7 @@ func (tc *replicaCalcTestCase) runTest(t *testing.T) {
stop := make(chan struct{})
defer close(stop)
informerFactory.Start(stop)
if !controller.WaitForCacheSync("HPA", stop, informer.Informer().HasSynced) {
if !cache.WaitForNamedCacheSync("HPA", stop, informer.Informer().HasSynced) {
return
}