github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 18:31:15 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: remove container-runtime=remote

Browse Source
This commit is contained in:
Paco Xu 2022-08-24 17:04:26 +08:00
parent 26842bb0c8
commit 5974da784c
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/phases/kubelet/flags.go
View File

@ -76,8 +76,6 @@ func WriteKubeletDynamicEnvFile(cfg *kubeadmapi.ClusterConfiguration, nodeReg *k
func buildKubeletArgMapCommon(opts kubeletFlagsOpts) map[string]string { func buildKubeletArgMapCommon(opts kubeletFlagsOpts) map[string]string {
kubeletFlags := map[string]string{} kubeletFlags := map[string]string{}
kubeletFlags["container-runtime-endpoint"] = opts.nodeRegOpts.CRISocket kubeletFlags["container-runtime-endpoint"] = opts.nodeRegOpts.CRISocket
// container runtime is by default docker in kubelet v1.23, so it can be removed in v1.26
kubeletFlags["container-runtime"] = "remote"
// This flag passes the pod infra container image (e.g. "pause" image) to the kubelet // This flag passes the pod infra container image (e.g. "pause" image) to the kubelet
// and prevents its garbage collection // and prevents its garbage collection

3
cmd/kubeadm/app/phases/kubelet/flags_test.go
View File

@ -42,7 +42,6 @@ func TestBuildKubeletArgMap(t *testing.T) {
}, },
}, },
expected: map[string]string{ expected: map[string]string{
"container-runtime": "remote",
"container-runtime-endpoint": "unix:///var/run/containerd/containerd.sock", "container-runtime-endpoint": "unix:///var/run/containerd/containerd.sock",
"hostname-override": "override-name", "hostname-override": "override-name",
}, },
@ -68,7 +67,6 @@ func TestBuildKubeletArgMap(t *testing.T) {
registerTaintsUsingFlags: true, registerTaintsUsingFlags: true,
}, },
expected: map[string]string{ expected: map[string]string{
"container-runtime": "remote",
"container-runtime-endpoint": "unix:///var/run/containerd/containerd.sock", "container-runtime-endpoint": "unix:///var/run/containerd/containerd.sock",
"register-with-taints": "foo=bar:baz,key=val:eff", "register-with-taints": "foo=bar:baz,key=val:eff",
}, },
@ -82,7 +80,6 @@ func TestBuildKubeletArgMap(t *testing.T) {
pauseImage: "registry.k8s.io/pause:3.8", pauseImage: "registry.k8s.io/pause:3.8",
}, },
expected: map[string]string{ expected: map[string]string{
"container-runtime": "remote",
"container-runtime-endpoint": "unix:///var/run/containerd/containerd.sock", "container-runtime-endpoint": "unix:///var/run/containerd/containerd.sock",
"pod-infra-container-image": "registry.k8s.io/pause:3.8", "pod-infra-container-image": "registry.k8s.io/pause:3.8",
}, },