diff --git a/pkg/daemons/agent/agent_linux.go b/pkg/daemons/agent/agent_linux.go index 812adde650..2de6c4a69d 100644 --- a/pkg/daemons/agent/agent_linux.go +++ b/pkg/daemons/agent/agent_linux.go @@ -87,15 +87,6 @@ func kubeletArgs(cfg *config.Agent) map[string]string { argsMap["root-dir"] = cfg.RootDir 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 { argsMap["cluster-dns"] = util.JoinIPs(cfg.ClusterDNSs) } @@ -103,8 +94,6 @@ func kubeletArgs(cfg *config.Agent) map[string]string { argsMap["resolv-conf"] = cfg.ResolvConf } if cfg.RuntimeSocket != "" { - argsMap["container-runtime"] = "remote" - argsMap["containerd"] = cfg.RuntimeSocket argsMap["serialize-image-pulls"] = "false" checkRuntimeEndpoint(cfg, argsMap) } else if cfg.PauseImage != "" { @@ -157,9 +146,6 @@ func kubeletArgs(cfg *config.Agent) map[string]string { if len(cfg.NodeTaints) > 0 { 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.") diff --git a/pkg/daemons/agent/agent_windows.go b/pkg/daemons/agent/agent_windows.go index 1e89034199..6618ee583d 100644 --- a/pkg/daemons/agent/agent_windows.go +++ b/pkg/daemons/agent/agent_windows.go @@ -78,15 +78,6 @@ func kubeletArgs(cfg *config.Agent) map[string]string { argsMap["root-dir"] = cfg.RootDir 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 { argsMap["cluster-dns"] = util.JoinIPs(cfg.ClusterDNSs) } @@ -123,9 +114,6 @@ func kubeletArgs(cfg *config.Agent) map[string]string { if len(cfg.NodeTaints) > 0 { 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.")