From ed9492ad69f05d492189968fb867fd6174085880 Mon Sep 17 00:00:00 2001 From: andrewsykim Date: Sun, 23 Feb 2020 06:40:20 -0500 Subject: [PATCH] use ControllerClientBuilder from k8s.io/cloud-provider in cloud-controller-manager Signed-off-by: andrewsykim --- cmd/cloud-controller-manager/app/config/BUILD | 2 +- cmd/cloud-controller-manager/app/config/config.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/cloud-controller-manager/app/config/BUILD b/cmd/cloud-controller-manager/app/config/BUILD index 0f6410b9189..00e16dee578 100644 --- a/cmd/cloud-controller-manager/app/config/BUILD +++ b/cmd/cloud-controller-manager/app/config/BUILD @@ -7,12 +7,12 @@ go_library( visibility = ["//visibility:public"], deps = [ "//cmd/cloud-controller-manager/app/apis/config:go_default_library", - "//pkg/controller:go_default_library", "//staging/src/k8s.io/apiserver/pkg/server:go_default_library", "//staging/src/k8s.io/client-go/informers:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", + "//staging/src/k8s.io/cloud-provider:go_default_library", ], ) diff --git a/cmd/cloud-controller-manager/app/config/config.go b/cmd/cloud-controller-manager/app/config/config.go index 229561eebe0..18bb647b7cb 100644 --- a/cmd/cloud-controller-manager/app/config/config.go +++ b/cmd/cloud-controller-manager/app/config/config.go @@ -22,8 +22,8 @@ import ( clientset "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/record" + cloudprovider "k8s.io/cloud-provider" ccmconfig "k8s.io/kubernetes/cmd/cloud-controller-manager/app/apis/config" - "k8s.io/kubernetes/pkg/controller" ) // Config is the main context object for the cloud controller manager. @@ -52,7 +52,7 @@ type Config struct { EventRecorder record.EventRecorder // ClientBuilder will provide a client for this controller to use - ClientBuilder controller.ControllerClientBuilder + ClientBuilder cloudprovider.ControllerClientBuilder // VersionedClient will provide a client for informers VersionedClient clientset.Interface