diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index 954854bdb1b..e0350af380a 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -51,6 +51,7 @@ import ( certutil "k8s.io/client-go/util/cert" "k8s.io/client-go/util/keyutil" cloudprovider "k8s.io/cloud-provider" + cpnames "k8s.io/cloud-provider/names" cliflag "k8s.io/component-base/cli/flag" "k8s.io/component-base/cli/globalflag" "k8s.io/component-base/configz" @@ -459,9 +460,9 @@ func NewControllerInitializers(loopMode ControllerLoopMode) map[string]InitFunc register(names.NodeIpamController, startNodeIpamController) register(names.NodeLifecycleController, startNodeLifecycleController) if loopMode == IncludeCloudLoops { - register(names.ServiceController, startServiceController) - register(names.RouteController, startRouteController) - register(names.CloudNodeLifecycleController, startCloudNodeLifecycleController) + register(cpnames.ServiceLBController, startServiceController) + register(cpnames.NodeRouteController, startRouteController) + register(cpnames.CloudNodeLifecycleController, startCloudNodeLifecycleController) // TODO: persistent volume controllers into the IncludeCloudLoops only set. } register(names.PersistentVolumeBinderController, startPersistentVolumeBinderController) diff --git a/cmd/kube-controller-manager/app/controllermanager_test.go b/cmd/kube-controller-manager/app/controllermanager_test.go index 3998e0d8a88..d71823e3796 100644 --- a/cmd/kube-controller-manager/app/controllermanager_test.go +++ b/cmd/kube-controller-manager/app/controllermanager_test.go @@ -22,6 +22,7 @@ import ( "testing" "k8s.io/apimachinery/pkg/util/sets" + cpnames "k8s.io/cloud-provider/names" "k8s.io/kubernetes/cmd/kube-controller-manager/names" ) @@ -67,9 +68,9 @@ func TestControllerNamesDeclaration(t *testing.T) { names.TokenCleanerController, names.NodeIpamController, names.NodeLifecycleController, - names.ServiceController, - names.RouteController, - names.CloudNodeLifecycleController, + cpnames.ServiceLBController, + cpnames.NodeRouteController, + cpnames.CloudNodeLifecycleController, names.PersistentVolumeBinderController, names.PersistentVolumeAttachDetachController, names.PersistentVolumeExpanderController, diff --git a/cmd/kube-controller-manager/app/options/options.go b/cmd/kube-controller-manager/app/options/options.go index ded2a8c069c..ce209c640b7 100644 --- a/cmd/kube-controller-manager/app/options/options.go +++ b/cmd/kube-controller-manager/app/options/options.go @@ -30,6 +30,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/record" + cpnames "k8s.io/cloud-provider/names" cpoptions "k8s.io/cloud-provider/options" cliflag "k8s.io/component-base/cli/flag" "k8s.io/component-base/logs" @@ -229,7 +230,7 @@ func (s *KubeControllerManagerOptions) Flags(allControllers []string, disabledBy fss := cliflag.NamedFlagSets{} s.Generic.AddFlags(&fss, allControllers, disabledByDefaultControllers, controllerAliases) s.KubeCloudShared.AddFlags(fss.FlagSet("generic")) - s.ServiceController.AddFlags(fss.FlagSet(names.ServiceController)) + s.ServiceController.AddFlags(fss.FlagSet(cpnames.ServiceLBController)) s.SecureServing.AddFlags(fss.FlagSet("secure serving")) s.Authentication.AddFlags(fss.FlagSet("authentication")) diff --git a/cmd/kube-controller-manager/names/controller_names.go b/cmd/kube-controller-manager/names/controller_names.go index 1042569588e..a3d606291db 100644 --- a/cmd/kube-controller-manager/names/controller_names.go +++ b/cmd/kube-controller-manager/names/controller_names.go @@ -16,6 +16,8 @@ limitations under the License. package names +import cpnames "k8s.io/cloud-provider/names" + // Canonical controller names // // NAMING CONVENTIONS @@ -72,9 +74,6 @@ const ( TokenCleanerController = "token-cleaner-controller" NodeIpamController = "node-ipam-controller" NodeLifecycleController = "node-lifecycle-controller" - ServiceController = "service-controller" - RouteController = "route-controller" - CloudNodeLifecycleController = "cloud-node-lifecycle-controller" PersistentVolumeBinderController = "persistentvolume-binder-controller" PersistentVolumeAttachDetachController = "persistentvolume-attach-detach-controller" PersistentVolumeExpanderController = "persistentvolume-expander-controller" @@ -122,9 +121,9 @@ func KCMControllerAliases() map[string]string { "tokencleaner": TokenCleanerController, "nodeipam": NodeIpamController, "nodelifecycle": NodeLifecycleController, - "service": ServiceController, - "route": RouteController, - "cloud-node-lifecycle": CloudNodeLifecycleController, + "service": cpnames.ServiceLBController, + "route": cpnames.NodeRouteController, + "cloud-node-lifecycle": cpnames.CloudNodeLifecycleController, "persistentvolume-binder": PersistentVolumeBinderController, "attachdetach": PersistentVolumeAttachDetachController, "persistentvolume-expander": PersistentVolumeExpanderController,