Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disable configure-cloud-routes and external service/route programming support when using k3s stub cloud controller

Browse Source 
Resolves warning 3 from #2471

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
This commit is contained in:
Brad Davidson 2020-11-03 09:27:56 -08:00 committed by Brad Davidson
parent 31575e407a
commit f50e3140f9
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/daemons/control/server.go
View File

@ -139,6 +139,7 @@ func controllerManager(cfg *config.Control, runtime *config.ControlRuntime) erro
"address": localhostIP.String(), "address": localhostIP.String(),
"bind-address": localhostIP.String(), "bind-address": localhostIP.String(),
"secure-port": "0", "secure-port": "0",
"cloud-provider": version.Program,
"use-service-account-credentials": "true", "use-service-account-credentials": "true",
"cluster-signing-cert-file": runtime.ClientCA, "cluster-signing-cert-file": runtime.ClientCA,
"cluster-signing-key-file": runtime.ClientCAKey, "cluster-signing-key-file": runtime.ClientCAKey,
@ -146,6 +147,10 @@ func controllerManager(cfg *config.Control, runtime *config.ControlRuntime) erro
if cfg.NoLeaderElect { if cfg.NoLeaderElect {
argsMap["leader-elect"] = "false" argsMap["leader-elect"] = "false"
} }
if !cfg.DisableCCM {
argsMap["configure-cloud-routes"] = "false"
argsMap["controllers"] = "*,-service,-route"
}
args := config.GetArgsList(argsMap, cfg.ExtraControllerArgs) args := config.GetArgsList(argsMap, cfg.ExtraControllerArgs)
logrus.Infof("Running kube-controller-manager %s", config.ArgString(args)) 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{ argsMap := map[string]string{
"kubeconfig": runtime.KubeConfigCloudController, "kubeconfig": runtime.KubeConfigCloudController,
"allocate-node-cidrs": "true", "allocate-node-cidrs": "true",
"configure-cloud-routes": "false",
"controllers": "*,-service,-route",
"cluster-cidr": cfg.ClusterIPRange.String(), "cluster-cidr": cfg.ClusterIPRange.String(),
"bind-address": localhostIP.String(), "bind-address": localhostIP.String(),
"secure-port": "0", "secure-port": "0",