Disable configure-cloud-routes and external service/route programming…

… support when using k3s stub cloud controller Resolves warning 3 from k3s-io#2471 Signed-off-by: Brad Davidson <[email protected]>
brandond · Nov 4, 2020 · 4395e55 · 4395e55
1 parent e109f13
commit 4395e55
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/manifests/ccm.yaml b/manifests/ccm.yaml
@@ -78,3 +78,6 @@ subjects:
 - kind: User
   name: cloud-controller-manager
   namespace: kube-system
+- kind: ServiceAccount
+  name: cloud-controller-manager
+  namespace: kube-system
diff --git a/pkg/daemons/control/server.go b/pkg/daemons/control/server.go
@@ -139,13 +139,18 @@ 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,
 	}
 	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",

diff --git a/pkg/deploy/zz_generated_bindata.go b/pkg/deploy/zz_generated_bindata.go