From 0ca7bf5e8640a1e58e79486e3aabae15d28b7bd0 Mon Sep 17 00:00:00 2001 From: stewart-yu Date: Fri, 1 Feb 2019 08:48:23 +0800 Subject: [PATCH] remove pkg/controller dependencies from k8s.io/kubernetes/pkg/cloudprovider/providers --- pkg/cloudprovider/providers/vsphere/BUILD | 1 - pkg/cloudprovider/providers/vsphere/credentialmanager_test.go | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/cloudprovider/providers/vsphere/BUILD b/pkg/cloudprovider/providers/vsphere/BUILD index 2831ceec49c..f985c1e18ec 100644 --- a/pkg/cloudprovider/providers/vsphere/BUILD +++ b/pkg/cloudprovider/providers/vsphere/BUILD @@ -49,7 +49,6 @@ go_test( deps = [ "//pkg/cloudprovider/providers/vsphere/vclib:go_default_library", "//pkg/cloudprovider/providers/vsphere/vclib/fixtures:go_default_library", - "//pkg/controller:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library", diff --git a/pkg/cloudprovider/providers/vsphere/credentialmanager_test.go b/pkg/cloudprovider/providers/vsphere/credentialmanager_test.go index aa2da6d57db..b148daa685f 100644 --- a/pkg/cloudprovider/providers/vsphere/credentialmanager_test.go +++ b/pkg/cloudprovider/providers/vsphere/credentialmanager_test.go @@ -25,7 +25,6 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" - "k8s.io/kubernetes/pkg/controller" ) func TestSecretCredentialManager_GetCredential(t *testing.T) { @@ -184,7 +183,8 @@ func TestSecretCredentialManager_GetCredential(t *testing.T) { }, } - informerFactory := informers.NewSharedInformerFactory(client, controller.NoResyncPeriodFunc()) + // TODO: replace 0 with NoResyncPeriodFunc() once it moved out pkg/controller/controller_utils.go in k/k. + informerFactory := informers.NewSharedInformerFactory(client, 0) secretInformer := informerFactory.Core().V1().Secrets() secretCredentialManager := &SecretCredentialManager{ SecretName: secretName,