github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
pull/5636/head v1.24.1-rc2+k3s1
Brad Davidson 2022-06-01 12:54:07 -07:00 committed by Brad Davidson
parent a5a0e8fde2
commit 29397b4e68
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/daemons/agent/agent_linux.go
View File

@ -150,6 +150,10 @@ func kubeletArgs(cfg *config.Agent) map[string]string {
argsMap["register-with-taints"] = strings.Join(cfg.NodeTaints, ",") argsMap["register-with-taints"] = strings.Join(cfg.NodeTaints, ",")
} }
if !cfg.DisableCCM {
argsMap["cloud-provider"] = "external"
}
if ImageCredProvAvailable(cfg) { if ImageCredProvAvailable(cfg) {
logrus.Infof("Kubelet image credential provider bin dir and configuration file found.") logrus.Infof("Kubelet image credential provider bin dir and configuration file found.")
argsMap["feature-gates"] = util.AddFeatureGate(argsMap["feature-gates"], "KubeletCredentialProviders=true") argsMap["feature-gates"] = util.AddFeatureGate(argsMap["feature-gates"], "KubeletCredentialProviders=true")

4
pkg/daemons/agent/agent_windows.go
View File

@ -116,6 +116,10 @@ func kubeletArgs(cfg *config.Agent) map[string]string {
argsMap["register-with-taints"] = strings.Join(cfg.NodeTaints, ",") argsMap["register-with-taints"] = strings.Join(cfg.NodeTaints, ",")
} }
if !cfg.DisableCCM {
argsMap["cloud-provider"] = "external"
}
if ImageCredProvAvailable(cfg) { if ImageCredProvAvailable(cfg) {
logrus.Infof("Kubelet image credential provider bin dir and configuration file found.") logrus.Infof("Kubelet image credential provider bin dir and configuration file found.")
argsMap["feature-gates"] = util.AddFeatureGate(argsMap["feature-gates"], "KubeletCredentialProviders=true") argsMap["feature-gates"] = util.AddFeatureGate(argsMap["feature-gates"], "KubeletCredentialProviders=true")