External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-04 11:08:16 -03:30
Code Issues Packages Projects Releases Wiki Activity

[docker] add support for cri-dockerd as a replacement for dockershim (#8623)

Browse Source
This commit is contained in:
Cristian Calin
2022-03-17 01:28:11 +02:00
committed by GitHub
parent 5043517cfb
commit 394857b5ce
23 changed files with 417 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/kubernetes/node/templates/kubelet.env.v1beta1.j2
View File

@@ -12,7 +12,7 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
--config={{ kube_config_dir }}/kubelet-config.yaml \
--kubeconfig={{ kube_config_dir }}/kubelet.conf \
{# end kubeadm specific settings #}
{% if container_manager == 'docker' %}
{% if container_manager == 'docker' and not cri_dockerd_enabled %}
--pod-infra-container-image={{ pod_infra_image_repo }}:{{ pod_infra_image_tag }} \
{% else %}
--container-runtime=remote \