Re-add --cloud-provider=external kubelet arg

The cloud-provider arg is deprecated and cannot be set to anything other than external, but must still be used or node addresses are not set properly. Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

Re-add --cloud-provider=external kubelet arg
29397b4e · Brad Davidson · Brad Davidson · a5a0e8fd · 29397b4e · 29397b4e
Commit 29397b4e authored Jun 01, 2022 by Brad Davidson Committed by Brad Davidson Jun 01, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

agent_linux.go pkg/daemons/agent/agent_linux.go +4 -0

agent_windows.go pkg/daemons/agent/agent_windows.go +4 -0

No files found.
--- a/pkg/daemons/agent/agent_linux.go
+++ b/pkg/daemons/agent/agent_linux.go
@@ -150,6 +150,10 @@ func kubeletArgs(cfg *config.Agent) map[string]string {
 		argsMap["register-with-taints"] = strings.Join(cfg.NodeTaints, ",")
 	}

+	if !cfg.DisableCCM {
+		argsMap["cloud-provider"] = "external"
+	}
+
 	if ImageCredProvAvailable(cfg) {
 		logrus.Infof("Kubelet image credential provider bin dir and configuration file found.")
 		argsMap["feature-gates"] = util.AddFeatureGate(argsMap["feature-gates"], "KubeletCredentialProviders=true")

--- a/pkg/daemons/agent/agent_windows.go
+++ b/pkg/daemons/agent/agent_windows.go
@@ -116,6 +116,10 @@ func kubeletArgs(cfg *config.Agent) map[string]string {
 		argsMap["register-with-taints"] = strings.Join(cfg.NodeTaints, ",")
 	}

+	if !cfg.DisableCCM {
+		argsMap["cloud-provider"] = "external"
+	}
+
 	if ImageCredProvAvailable(cfg) {
 		logrus.Infof("Kubelet image credential provider bin dir and configuration file found.")
 		argsMap["feature-gates"] = util.AddFeatureGate(argsMap["feature-gates"], "KubeletCredentialProviders=true")