Add stub Cluster ID support to CCM

Resolves warning 2 from k3s-io#2471. As per kubernetes/cloud-provider#12 the ClusterID requirement was never really followed through on, so the flag is probably going to be removed in the future along with the warning it currently triggers. Signed-off-by: Brad Davidson <[email protected]>
brandond · Nov 4, 2020 · 9559011 · 9559011
1 parent 35c44fd
commit 9559011
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/pkg/cloudprovider/cloudprovider.go b/pkg/cloudprovider/cloudprovider.go
@@ -58,5 +58,5 @@ func (k *k3s) ProviderName() string {
 }
 
 func (k *k3s) HasClusterID() bool {
-	return false
+	return true
 }
diff --git a/pkg/daemons/control/server.go b/pkg/daemons/control/server.go
@@ -920,7 +920,6 @@ func cloudControllerManager(ctx context.Context, cfg *config.Control, runtime *c
 		"bind-address":                 localhostIP.String(),
 		"secure-port":                  "0",
 		"cloud-provider":               version.Program,
-		"allow-untagged-cloud":         "true",
 		"node-status-update-frequency": "1m",
 		"profiling":                    "false",
 	}