Skip to content

K
k3s
Commit 551f2fa0 authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson
Browse files
Options

Remove deprecated flags from kubelet

Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent ea3f78ac
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 26 deletions
pkg/daemons/agent/agent_linux.go
View file @ 551f2fa0
...@@ -87,15 +87,6 @@ func kubeletArgs(cfg *config.Agent) map[string]string { ...@@ -87,15 +87,6 @@ func kubeletArgs(cfg *config.Agent) map[string]string {
argsMap["root-dir"] = cfg.RootDir argsMap["root-dir"] = cfg.RootDir
argsMap["cert-dir"] = filepath.Join(cfg.RootDir, "pki") argsMap["cert-dir"] = filepath.Join(cfg.RootDir, "pki")
} }
if cfg.CNIConfDir != "" {
argsMap["cni-conf-dir"] = cfg.CNIConfDir
}
if cfg.CNIBinDir != "" {
argsMap["cni-bin-dir"] = cfg.CNIBinDir
}
if cfg.CNIPlugin {
argsMap["network-plugin"] = "cni"
}
if len(cfg.ClusterDNS) > 0 { if len(cfg.ClusterDNS) > 0 {
argsMap["cluster-dns"] = util.JoinIPs(cfg.ClusterDNSs) argsMap["cluster-dns"] = util.JoinIPs(cfg.ClusterDNSs)
} }
...@@ -103,8 +94,6 @@ func kubeletArgs(cfg *config.Agent) map[string]string { ...@@ -103,8 +94,6 @@ func kubeletArgs(cfg *config.Agent) map[string]string {
argsMap["resolv-conf"] = cfg.ResolvConf argsMap["resolv-conf"] = cfg.ResolvConf
} }
if cfg.RuntimeSocket != "" { if cfg.RuntimeSocket != "" {
argsMap["container-runtime"] = "remote"
argsMap["containerd"] = cfg.RuntimeSocket
argsMap["serialize-image-pulls"] = "false" argsMap["serialize-image-pulls"] = "false"
checkRuntimeEndpoint(cfg, argsMap) checkRuntimeEndpoint(cfg, argsMap)
} else if cfg.PauseImage != "" { } else if cfg.PauseImage != "" {
...@@ -157,9 +146,6 @@ func kubeletArgs(cfg *config.Agent) map[string]string { ...@@ -157,9 +146,6 @@ func kubeletArgs(cfg *config.Agent) map[string]string {
if len(cfg.NodeTaints) > 0 { if len(cfg.NodeTaints) > 0 {
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.")
......
pkg/daemons/agent/agent_windows.go
View file @ 551f2fa0
...@@ -78,15 +78,6 @@ func kubeletArgs(cfg *config.Agent) map[string]string { ...@@ -78,15 +78,6 @@ func kubeletArgs(cfg *config.Agent) map[string]string {
argsMap["root-dir"] = cfg.RootDir argsMap["root-dir"] = cfg.RootDir
argsMap["cert-dir"] = filepath.Join(cfg.RootDir, "pki") argsMap["cert-dir"] = filepath.Join(cfg.RootDir, "pki")
} }
if cfg.CNIConfDir != "" {
argsMap["cni-conf-dir"] = cfg.CNIConfDir
}
if cfg.CNIBinDir != "" {
argsMap["cni-bin-dir"] = cfg.CNIBinDir
}
if cfg.CNIPlugin {
argsMap["network-plugin"] = "cni"
}
if len(cfg.ClusterDNS) > 0 { if len(cfg.ClusterDNS) > 0 {
argsMap["cluster-dns"] = util.JoinIPs(cfg.ClusterDNSs) argsMap["cluster-dns"] = util.JoinIPs(cfg.ClusterDNSs)
} }
...@@ -123,9 +114,6 @@ func kubeletArgs(cfg *config.Agent) map[string]string { ...@@ -123,9 +114,6 @@ func kubeletArgs(cfg *config.Agent) map[string]string {
if len(cfg.NodeTaints) > 0 { if len(cfg.NodeTaints) > 0 {
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.")
......
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