Skip to content

K
k3s
Commit 29397b4e authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson
Browse files
Options

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: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent a5a0e8fd
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
pkg/daemons/agent/agent_linux.go
View file @ 29397b4e
...@@ -150,6 +150,10 @@ func kubeletArgs(cfg *config.Agent) map[string]string { ...@@ -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")
......
pkg/daemons/agent/agent_windows.go
View file @ 29397b4e
...@@ -116,6 +116,10 @@ func kubeletArgs(cfg *config.Agent) map[string]string { ...@@ -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")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment