diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2021-05-15 21:00:42 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2021-05-15 21:00:42 +0200 |
| commit | ae3f3e1ecd6e2ba860ed769c40a9a3e375dd11bc (patch) | |
| tree | b0bc528fd8d3a198d7ab04cfddd9cfd22dc0dd8c /roles/kubernetes/base/tasks/cri_docker.yml | |
| parent | cosmetic fix (diff) | |
| parent | bump kubernetes version for most standalone kubelets (diff) | |
Merge branch 'topic/k8s-containerd'
Diffstat (limited to 'roles/kubernetes/base/tasks/cri_docker.yml')
| -rw-r--r-- | roles/kubernetes/base/tasks/cri_docker.yml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/roles/kubernetes/base/tasks/cri_docker.yml b/roles/kubernetes/base/tasks/cri_docker.yml index 187d5893..88b35508 100644 --- a/roles/kubernetes/base/tasks/cri_docker.yml +++ b/roles/kubernetes/base/tasks/cri_docker.yml @@ -17,9 +17,17 @@ After=docker.service dest: /etc/systemd/system/kubelet.service.d/after-docker.conf -- name: disable bridge and iptables in docker daemon config +- name: disable bridge and iptables in docker daemon config and switch to systemd cgroup driver set_fact: - docker_daemon_config: "{{ docker_daemon_config | default({}) | combine({'exec-opts': ['native.cgroupdriver=systemd'], 'bridge': 'none', 'iptables': false}) }}" + docker_daemon_config_override: + exec-opts: + - "native.cgroupdriver=systemd" + bridge: "none" + iptables: false + +- name: override mandatory settings in docker_daemon_config + set_fact: + docker_daemon_config: "{{ docker_daemon_config | default({}) | combine(docker_daemon_config_override, recursive=True, list_merge='append') }}" - name: install docker include_role: |