From c6466b234355f990f026aded5bfc015e998e6ee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20K=C3=A4ldstr=C3=B6m?= Date: Tue, 4 Sep 2018 22:11:00 +0300 Subject: [PATCH] Start using the new packages in the ccm --- cmd/cloud-controller-manager/app/config/BUILD | 2 +- .../app/config/config.go | 4 +-- .../app/options/BUILD | 6 ++-- .../app/options/options.go | 33 +++++++------------ 4 files changed, 17 insertions(+), 28 deletions(-) diff --git a/cmd/cloud-controller-manager/app/config/BUILD b/cmd/cloud-controller-manager/app/config/BUILD index e77beafaac8..0f6410b9189 100644 --- a/cmd/cloud-controller-manager/app/config/BUILD +++ b/cmd/cloud-controller-manager/app/config/BUILD @@ -6,7 +6,7 @@ go_library( importpath = "k8s.io/kubernetes/cmd/cloud-controller-manager/app/config", visibility = ["//visibility:public"], deps = [ - "//pkg/apis/componentconfig:go_default_library", + "//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", diff --git a/cmd/cloud-controller-manager/app/config/config.go b/cmd/cloud-controller-manager/app/config/config.go index c4ccf92b4c2..229561eebe0 100644 --- a/cmd/cloud-controller-manager/app/config/config.go +++ b/cmd/cloud-controller-manager/app/config/config.go @@ -22,13 +22,13 @@ import ( clientset "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/record" - "k8s.io/kubernetes/pkg/apis/componentconfig" + 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. type Config struct { - ComponentConfig componentconfig.CloudControllerManagerConfiguration + ComponentConfig ccmconfig.CloudControllerManagerConfiguration SecureServing *apiserver.SecureServingInfo // LoopbackClientConfig is a config for a privileged loopback connection diff --git a/cmd/cloud-controller-manager/app/options/BUILD b/cmd/cloud-controller-manager/app/options/BUILD index 972cd3b2e34..07f82ee0096 100644 --- a/cmd/cloud-controller-manager/app/options/BUILD +++ b/cmd/cloud-controller-manager/app/options/BUILD @@ -11,17 +11,17 @@ go_library( srcs = ["options.go"], importpath = "k8s.io/kubernetes/cmd/cloud-controller-manager/app/options", deps = [ + "//cmd/cloud-controller-manager/app/apis/config:go_default_library", + "//cmd/cloud-controller-manager/app/apis/config/scheme:go_default_library", + "//cmd/cloud-controller-manager/app/apis/config/v1alpha1:go_default_library", "//cmd/cloud-controller-manager/app/config:go_default_library", "//cmd/controller-manager/app/options:go_default_library", "//pkg/api/legacyscheme:go_default_library", - "//pkg/apis/componentconfig:go_default_library", - "//pkg/apis/componentconfig/v1alpha1:go_default_library", "//pkg/controller: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", diff --git a/cmd/cloud-controller-manager/app/options/options.go b/cmd/cloud-controller-manager/app/options/options.go index 8abfad41d30..53268cd179b 100644 --- a/cmd/cloud-controller-manager/app/options/options.go +++ b/cmd/cloud-controller-manager/app/options/options.go @@ -22,9 +22,10 @@ import ( "net" "time" + "github.com/golang/glog" + "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/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" @@ -35,17 +36,16 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/record" + ccmconfig "k8s.io/kubernetes/cmd/cloud-controller-manager/app/apis/config" + ccmconfigscheme "k8s.io/kubernetes/cmd/cloud-controller-manager/app/apis/config/scheme" + ccmconfigv1alpha1 "k8s.io/kubernetes/cmd/cloud-controller-manager/app/apis/config/v1alpha1" cloudcontrollerconfig "k8s.io/kubernetes/cmd/cloud-controller-manager/app/config" cmoptions "k8s.io/kubernetes/cmd/controller-manager/app/options" "k8s.io/kubernetes/pkg/api/legacyscheme" - "k8s.io/kubernetes/pkg/apis/componentconfig" - componentconfigv1alpha1 "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/master/ports" // add the kubernetes feature gates _ "k8s.io/kubernetes/pkg/features" - - "github.com/golang/glog" ) const ( @@ -108,24 +108,13 @@ func NewCloudControllerManagerOptions() (*CloudControllerManagerOptions, error) } // NewDefaultComponentConfig returns cloud-controller manager configuration object. -func NewDefaultComponentConfig(insecurePort int32) (*componentconfig.CloudControllerManagerConfiguration, error) { - // TODO: This code will be fixed up/improved when the ccm API types are moved to their own, real API group out of - // pkg/apis/componentconfig to cmd/cloud-controller-manager/app/apis/ - scheme := runtime.NewScheme() - if err := componentconfigv1alpha1.AddToScheme(scheme); err != nil { - return nil, err - } - if err := componentconfig.AddToScheme(scheme); err != nil { - return nil, err - } - scheme.AddKnownTypes(componentconfigv1alpha1.SchemeGroupVersion, &componentconfigv1alpha1.CloudControllerManagerConfiguration{}) - scheme.AddKnownTypes(componentconfig.SchemeGroupVersion, &componentconfig.CloudControllerManagerConfiguration{}) +func NewDefaultComponentConfig(insecurePort int32) (*ccmconfig.CloudControllerManagerConfiguration, error) { + versioned := &ccmconfigv1alpha1.CloudControllerManagerConfiguration{} + ccmconfigscheme.Scheme.Default(versioned) - versioned := &componentconfigv1alpha1.CloudControllerManagerConfiguration{} - internal := &componentconfig.CloudControllerManagerConfiguration{} - scheme.Default(versioned) - if err := scheme.Convert(versioned, internal, nil); err != nil { - return internal, err + internal := &ccmconfig.CloudControllerManagerConfiguration{} + if err := ccmconfigscheme.Scheme.Convert(versioned, internal, nil); err != nil { + return nil, err } internal.Generic.Port = insecurePort return internal, nil