From 43574d1be3e58d61d4299bcfae51378334f82774 Mon Sep 17 00:00:00 2001 From: stewart-yu Date: Wed, 26 Sep 2018 10:57:59 +0800 Subject: [PATCH] remove kube-controller-manager dependency on the legacyscheme, using client-go scheme --- cmd/kube-controller-manager/app/options/BUILD | 5 ++--- .../app/options/options.go | 20 +++++-------------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/cmd/kube-controller-manager/app/options/BUILD b/cmd/kube-controller-manager/app/options/BUILD index fcae9358cf7..188f21a08d9 100644 --- a/cmd/kube-controller-manager/app/options/BUILD +++ b/cmd/kube-controller-manager/app/options/BUILD @@ -34,20 +34,19 @@ go_library( deps = [ "//cmd/controller-manager/app/options:go_default_library", "//cmd/kube-controller-manager/app/config:go_default_library", - "//pkg/api/legacyscheme:go_default_library", "//pkg/controller/apis/config:go_default_library", - "//pkg/controller/apis/config/v1alpha1:go_default_library", + "//pkg/controller/apis/config/scheme:go_default_library", "//pkg/controller/garbagecollector:go_default_library", "//pkg/features:go_default_library", "//pkg/master/ports: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/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library", "//staging/src/k8s.io/apiserver/pkg/server/options:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/flag:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", + "//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library", diff --git a/cmd/kube-controller-manager/app/options/options.go b/cmd/kube-controller-manager/app/options/options.go index 22cf24a12e3..251e4b029ab 100644 --- a/cmd/kube-controller-manager/app/options/options.go +++ b/cmd/kube-controller-manager/app/options/options.go @@ -23,12 +23,12 @@ import ( "net" "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/runtime" utilerrors "k8s.io/apimachinery/pkg/util/errors" apiserveroptions "k8s.io/apiserver/pkg/server/options" utilfeature "k8s.io/apiserver/pkg/util/feature" apiserverflag "k8s.io/apiserver/pkg/util/flag" clientset "k8s.io/client-go/kubernetes" + clientgokubescheme "k8s.io/client-go/kubernetes/scheme" v1core "k8s.io/client-go/kubernetes/typed/core/v1" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" @@ -36,9 +36,8 @@ import ( kubectrlmgrconfigv1alpha1 "k8s.io/kube-controller-manager/config/v1alpha1" cmoptions "k8s.io/kubernetes/cmd/controller-manager/app/options" kubecontrollerconfig "k8s.io/kubernetes/cmd/kube-controller-manager/app/config" - "k8s.io/kubernetes/pkg/api/legacyscheme" kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config" - kubectrlmgrschemev1alpha1 "k8s.io/kubernetes/pkg/controller/apis/config/v1alpha1" + kubectrlmgrconfigscheme "k8s.io/kubernetes/pkg/controller/apis/config/scheme" "k8s.io/kubernetes/pkg/controller/garbagecollector" "k8s.io/kubernetes/pkg/master/ports" @@ -206,19 +205,11 @@ func NewKubeControllerManagerOptions() (*KubeControllerManagerOptions, error) { // NewDefaultComponentConfig returns kube-controller manager configuration object. func NewDefaultComponentConfig(insecurePort int32) (kubectrlmgrconfig.KubeControllerManagerConfiguration, error) { - scheme := runtime.NewScheme() - if err := kubectrlmgrschemev1alpha1.AddToScheme(scheme); err != nil { - return kubectrlmgrconfig.KubeControllerManagerConfiguration{}, err - } - if err := kubectrlmgrconfig.AddToScheme(scheme); err != nil { - return kubectrlmgrconfig.KubeControllerManagerConfiguration{}, err - } - versioned := kubectrlmgrconfigv1alpha1.KubeControllerManagerConfiguration{} - scheme.Default(&versioned) + kubectrlmgrconfigscheme.Scheme.Default(&versioned) internal := kubectrlmgrconfig.KubeControllerManagerConfiguration{} - if err := scheme.Convert(&versioned, &internal, nil); err != nil { + if err := kubectrlmgrconfigscheme.Scheme.Convert(&versioned, &internal, nil); err != nil { return internal, err } internal.Generic.Port = insecurePort @@ -442,6 +433,5 @@ func createRecorder(kubeClient clientset.Interface, userAgent string) record.Eve eventBroadcaster := record.NewBroadcaster() eventBroadcaster.StartLogging(glog.Infof) eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: kubeClient.CoreV1().Events("")}) - // TODO: remove dependency on the legacyscheme - return eventBroadcaster.NewRecorder(legacyscheme.Scheme, v1.EventSource{Component: userAgent}) + return eventBroadcaster.NewRecorder(clientgokubescheme.Scheme, v1.EventSource{Component: userAgent}) }