github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-16 23:29:21 +00:00
Code Issues Projects Releases Wiki Activity

deduplicate cloud provider controller names

Browse Source 
and move the to cloud-provider module
This commit is contained in:
Filip Křepinský 2023-02-15 20:33:28 +01:00
parent e5f5a9bfdb
commit 4e6a3fb9c1
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/kube-controller-manager/app/controllermanager.go
View File

@ -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)

7
cmd/kube-controller-manager/app/controllermanager_test.go
View File

@ -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,

3
cmd/kube-controller-manager/app/options/options.go
View File

@ -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"))

11
cmd/kube-controller-manager/names/controller_names.go
View File

@ -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,