From 982249110e631174c66019ad9f6ed887343d276f Mon Sep 17 00:00:00 2001 From: stewart-yu Date: Tue, 14 Aug 2018 09:29:00 +0800 Subject: [PATCH 1/2] [kube-controller manager]remove the redundancy import --- cmd/kube-controller-manager/app/options/options.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/kube-controller-manager/app/options/options.go b/cmd/kube-controller-manager/app/options/options.go index a64299a0fd..eb818c9e5b 100644 --- a/cmd/kube-controller-manager/app/options/options.go +++ b/cmd/kube-controller-manager/app/options/options.go @@ -29,7 +29,6 @@ import ( "k8s.io/apimachinery/pkg/util/sets" apiserveroptions "k8s.io/apiserver/pkg/server/options" utilfeature "k8s.io/apiserver/pkg/util/feature" - "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes" v1core "k8s.io/client-go/kubernetes/typed/core/v1" restclient "k8s.io/client-go/rest" @@ -460,7 +459,7 @@ func (s KubeControllerManagerOptions) Config(allControllers []string, disabledBy return c, nil } -func createRecorder(kubeClient kubernetes.Interface, userAgent string) record.EventRecorder { +func createRecorder(kubeClient clientset.Interface, userAgent string) record.EventRecorder { eventBroadcaster := record.NewBroadcaster() eventBroadcaster.StartLogging(glog.Infof) eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: kubeClient.CoreV1().Events("")}) From 9f4ae6ddf66c2435a50a401ef40de2bdde1e4d19 Mon Sep 17 00:00:00 2001 From: stewart-yu Date: Tue, 14 Aug 2018 11:31:19 +0800 Subject: [PATCH 2/2] [cloud-controller manager]remove the redundancy import --- cmd/cloud-controller-manager/app/options/options.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/cloud-controller-manager/app/options/options.go b/cmd/cloud-controller-manager/app/options/options.go index ece52e9e21..854a1450c9 100644 --- a/cmd/cloud-controller-manager/app/options/options.go +++ b/cmd/cloud-controller-manager/app/options/options.go @@ -29,7 +29,6 @@ import ( apiserveroptions "k8s.io/apiserver/pkg/server/options" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/informers" - "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes" v1core "k8s.io/client-go/kubernetes/typed/core/v1" restclient "k8s.io/client-go/rest" @@ -269,7 +268,7 @@ func (o *CloudControllerManagerOptions) Config() (*cloudcontrollerconfig.Config, return c, nil } -func createRecorder(kubeClient kubernetes.Interface, userAgent string) record.EventRecorder { +func createRecorder(kubeClient clientset.Interface, userAgent string) record.EventRecorder { eventBroadcaster := record.NewBroadcaster() eventBroadcaster.StartLogging(glog.Infof) eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: kubeClient.CoreV1().Events("")})