Skip to content

Commit a230e75

Browse files
committed
kubelet: Set --config to avoid using legacy defaults
Fixes #12164
1 parent 92b3e0b commit a230e75

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

pkg/daemons/agent/agent_linux.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"github.com/k3s-io/k3s/pkg/cgroups"
1414
"github.com/k3s-io/k3s/pkg/daemons/config"
1515
"github.com/k3s-io/k3s/pkg/util"
16+
"github.com/k3s-io/k3s/pkg/version"
1617
"github.com/sirupsen/logrus"
1718
"golang.org/x/sys/unix"
1819
kubeletconfig "k8s.io/kubelet/config/v1beta1"
@@ -75,6 +76,7 @@ func kubeletArgsAndConfig(cfg *config.Agent) (map[string]string, *kubeletconfig.
7576
return nil, nil, err
7677
}
7778
argsMap := map[string]string{
79+
"config": filepath.Join(cfg.KubeletConfigDir, "00-"+version.Program+"-defaults.conf"),
7880
"config-dir": cfg.KubeletConfigDir,
7981
"kubeconfig": cfg.KubeConfigKubelet,
8082
}

pkg/daemons/agent/agent_windows.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010

1111
"github.com/k3s-io/k3s/pkg/daemons/config"
1212
"github.com/k3s-io/k3s/pkg/util"
13+
"github.com/k3s-io/k3s/pkg/version"
1314
"github.com/sirupsen/logrus"
1415
kubeletconfig "k8s.io/kubelet/config/v1beta1"
1516
utilsnet "k8s.io/utils/net"
@@ -48,6 +49,7 @@ func kubeletArgsAndConfig(cfg *config.Agent) (map[string]string, *kubeletconfig.
4849
return nil, nil, err
4950
}
5051
argsMap := map[string]string{
52+
"config": filepath.Join(cfg.KubeletConfigDir, "00-"+version.Program+"-defaults.conf"),
5153
"config-dir": cfg.KubeletConfigDir,
5254
"kubeconfig": cfg.KubeConfigKubelet,
5355
}

0 commit comments

Comments
 (0)