From 281b7f3b41def96546385034c9cc9ca98634206a Mon Sep 17 00:00:00 2001 From: hzxuzhonghu Date: Sat, 31 Mar 2018 14:26:40 +0800 Subject: [PATCH 1/2] remove usless arguments of startControllers --- cmd/cloud-controller-manager/app/controllermanager.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cmd/cloud-controller-manager/app/controllermanager.go b/cmd/cloud-controller-manager/app/controllermanager.go index 36a83fc86c8..414b2f5a50c 100644 --- a/cmd/cloud-controller-manager/app/controllermanager.go +++ b/cmd/cloud-controller-manager/app/controllermanager.go @@ -34,7 +34,6 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/leaderelection" "k8s.io/client-go/tools/leaderelection/resourcelock" - "k8s.io/client-go/tools/record" cloudcontrollerconfig "k8s.io/kubernetes/cmd/cloud-controller-manager/app/config" "k8s.io/kubernetes/cmd/cloud-controller-manager/app/options" genericcontrollermanager "k8s.io/kubernetes/cmd/controller-manager/app" @@ -144,7 +143,7 @@ func Run(c *cloudcontrollerconfig.CompletedConfig) error { clientBuilder = rootClientBuilder } - if err := startControllers(c, c.Generic.Kubeconfig, rootClientBuilder, clientBuilder, stop, c.Generic.EventRecorder, cloud); err != nil { + if err := startControllers(c, rootClientBuilder, clientBuilder, stop, cloud); err != nil { glog.Fatalf("error running controllers: %v", err) } } @@ -192,7 +191,7 @@ func Run(c *cloudcontrollerconfig.CompletedConfig) error { } // startControllers starts the cloud specific controller loops. -func startControllers(c *cloudcontrollerconfig.CompletedConfig, kubeconfig *restclient.Config, rootClientBuilder, clientBuilder controller.ControllerClientBuilder, stop <-chan struct{}, recorder record.EventRecorder, cloud cloudprovider.Interface) error { +func startControllers(c *cloudcontrollerconfig.CompletedConfig, rootClientBuilder, clientBuilder controller.ControllerClientBuilder, stop <-chan struct{}, cloud cloudprovider.Interface) error { // Function to build the kube client object client := func(serviceAccountName string) kubernetes.Interface { return clientBuilder.ClientOrDie(serviceAccountName) From c6e74da162ee3fae077724908ff52bd355c8dfe9 Mon Sep 17 00:00:00 2001 From: hzxuzhonghu Date: Sat, 31 Mar 2018 17:01:51 +0800 Subject: [PATCH 2/2] update bazel --- cmd/cloud-controller-manager/app/BUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/cmd/cloud-controller-manager/app/BUILD b/cmd/cloud-controller-manager/app/BUILD index 3574f5d645d..4fed506a577 100644 --- a/cmd/cloud-controller-manager/app/BUILD +++ b/cmd/cloud-controller-manager/app/BUILD @@ -26,7 +26,6 @@ go_library( "//vendor/k8s.io/client-go/rest:go_default_library", "//vendor/k8s.io/client-go/tools/leaderelection:go_default_library", "//vendor/k8s.io/client-go/tools/leaderelection/resourcelock:go_default_library", - "//vendor/k8s.io/client-go/tools/record:go_default_library", ], )