diff --git a/pkg/daemons/control/server.go b/pkg/daemons/control/server.go index 41907e245d..ca425a761a 100644 --- a/pkg/daemons/control/server.go +++ b/pkg/daemons/control/server.go @@ -139,6 +139,7 @@ func controllerManager(cfg *config.Control, runtime *config.ControlRuntime) erro "address": localhostIP.String(), "bind-address": localhostIP.String(), "secure-port": "0", + "cloud-provider": version.Program, "use-service-account-credentials": "true", "cluster-signing-cert-file": runtime.ClientCA, "cluster-signing-key-file": runtime.ClientCAKey, @@ -146,6 +147,10 @@ func controllerManager(cfg *config.Control, runtime *config.ControlRuntime) erro if cfg.NoLeaderElect { argsMap["leader-elect"] = "false" } + if !cfg.DisableCCM { + argsMap["configure-cloud-routes"] = "false" + argsMap["controllers"] = "*,-service,-route" + } args := config.GetArgsList(argsMap, cfg.ExtraControllerArgs) logrus.Infof("Running kube-controller-manager %s", config.ArgString(args)) @@ -909,6 +914,8 @@ func cloudControllerManager(ctx context.Context, cfg *config.Control, runtime *c argsMap := map[string]string{ "kubeconfig": runtime.KubeConfigCloudController, "allocate-node-cidrs": "true", + "configure-cloud-routes": "false", + "controllers": "*,-service,-route", "cluster-cidr": cfg.ClusterIPRange.String(), "bind-address": localhostIP.String(), "secure-port": "0",