kubelet: Use --config for default config

Signed-off-by: Boleyn Su <[email protected]>

Author: BoleynSu

pkg/agent/config/config.go

@@ -601,6 +601,7 @@ func get(ctx context.Context, envInfo *cmds.Agent, proxy proxy.Proxy) (*config.N
 		return nil, err
 	}
 
+	kubeletConfig := filepath.Join(envInfo.DataDir, "agent", "etc", "kubelet.conf")
 	// Ensure kubelet config dir exists
 	kubeletConfigDir := filepath.Join(envInfo.DataDir, "agent", "etc", "kubelet.conf.d")
 	if err := os.MkdirAll(kubeletConfigDir, 0700); err != nil {
@@ -635,6 +636,7 @@ func get(ctx context.Context, envInfo *cmds.Agent, proxy proxy.Proxy) (*config.N
 	nodeConfig.AgentConfig.ClusterDomain = controlConfig.ClusterDomain
 	nodeConfig.AgentConfig.ResolvConf = locateOrGenerateResolvConf(envInfo)
 	nodeConfig.AgentConfig.ClientCA = clientCAFile
+	nodeConfig.AgentConfig.KubeletConfig = kubeletConfig
 	nodeConfig.AgentConfig.KubeletConfigDir = kubeletConfigDir
 	nodeConfig.AgentConfig.KubeConfigKubelet = kubeconfigKubelet
 	nodeConfig.AgentConfig.KubeConfigKubeProxy = kubeconfigKubeproxy

pkg/daemons/agent/agent.go

@@ -72,7 +72,7 @@ func startKubelet(ctx context.Context, cfg *daemonconfig.Agent) error {
 		return pkgerrors.WithMessage(err, "prepare user configuration drop-ins")
 	}
 
-	if err := writeKubeletConfig(cfg.KubeletConfigDir, defaultConfig); err != nil {
+	if err := writeKubeletConfig(cfg.KubeletConfig, defaultConfig); err != nil {
 		return pkgerrors.WithMessage(err, "generate default kubelet configuration drop-in")
 	}
 
@@ -158,7 +158,7 @@ func writeKubeletConfig(path string, config *kubeletconfig.KubeletConfiguration)
 	if err != nil {
 		return err
 	}
-	return os.WriteFile(filepath.Join(path, "00-"+version.Program+"-defaults.conf"), b, 0600)
+	return os.WriteFile(path, b, 0600)
 }
 
 func defaultKubeletConfig(cfg *daemonconfig.Agent) (*kubeletconfig.KubeletConfiguration, error) {

pkg/daemons/agent/agent_linux.go

@@ -13,7 +13,6 @@ import (
 	"github.com/k3s-io/k3s/pkg/cgroups"
 	"github.com/k3s-io/k3s/pkg/daemons/config"
 	"github.com/k3s-io/k3s/pkg/util"
-	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 	kubeletconfig "k8s.io/kubelet/config/v1beta1"
@@ -76,7 +75,7 @@ func kubeletArgsAndConfig(cfg *config.Agent) (map[string]string, *kubeletconfig.
 		return nil, nil, err
 	}
 	argsMap := map[string]string{
-		"config": filepath.Join(cfg.KubeletConfigDir, "00-"+version.Program+"-defaults.conf"),
+		"config": cfg.kubeletConfig,
 		"config-dir": cfg.KubeletConfigDir,
 		"kubeconfig": cfg.KubeConfigKubelet,
 	}

pkg/daemons/agent/agent_windows.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/k3s-io/k3s/pkg/daemons/config"
 	"github.com/k3s-io/k3s/pkg/util"
-	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
 	kubeletconfig "k8s.io/kubelet/config/v1beta1"
 	utilsnet "k8s.io/utils/net"
@@ -49,7 +48,7 @@ func kubeletArgsAndConfig(cfg *config.Agent) (map[string]string, *kubeletconfig.
 		return nil, nil, err
 	}
 	argsMap := map[string]string{
-		"config": filepath.Join(cfg.KubeletConfigDir, "00-"+version.Program+"-defaults.conf"),
+		"config": cfg.KubeletConfig,
 		"config-dir": cfg.KubeletConfigDir,
 		"kubeconfig": cfg.KubeConfigKubelet,
 	}

pkg/daemons/config/types.go

@@ -119,6 +119,7 @@ type Agent struct {
 	ClusterDomain           string
 	ResolvConf              string
 	RootDir                 string
+	KubeletConfig           string
 	KubeletConfigDir        string
 	KubeConfigKubelet       string
 	KubeConfigKubeProxy     string