github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #110047 from pacoxu/kubeadm-docker

Browse Source 
kubeadm: container runtime is by default docker in kubelet v1.23
This commit is contained in:
Kubernetes Prow Robot 2022-05-14 05:01:17 -07:00 committed by GitHub
commit b11ac8be28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 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,6 +76,8 @@ func WriteKubeletDynamicEnvFile(cfg *kubeadmapi.ClusterConfiguration, nodeReg *k
func buildKubeletArgMapCommon(opts kubeletFlagsOpts) map[string]string {
kubeletFlags := map[string]string{}
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
// and prevents its garbage collection

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

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