Merge pull request kubernetes#88436 from andrewsykim/ccm-client-builder-cleanup

use ControllerClientBuilder from k8s.io/cloud-provider in cloud-controller-manager

Author: k8s-ci-robot

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",
     ],
 )
 

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