diff options
author | Christian Pointner <equinox@spreadspace.org> | 2022-01-12 02:09:46 +0100 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2022-01-12 02:09:46 +0100 |
commit | 9410736d374ca68d5013f5f952dbce8d6b4fac66 (patch) | |
tree | 72fcb0c2b70ce0afc9db7c537e382232758a497d /roles/kubernetes/base/tasks | |
parent | Merge branch 'topic/no-more-kubic' (diff) | |
parent | containerd: change package selection to same method as for docker (diff) |
Merge branch 'topic/cri-dockerd'
Diffstat (limited to 'roles/kubernetes/base/tasks')
-rw-r--r-- | roles/kubernetes/base/tasks/cri_docker.yml | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/roles/kubernetes/base/tasks/cri_docker.yml b/roles/kubernetes/base/tasks/cri_docker.yml index a9b5dec1..91de6836 100644 --- a/roles/kubernetes/base/tasks/cri_docker.yml +++ b/roles/kubernetes/base/tasks/cri_docker.yml @@ -3,7 +3,7 @@ assert: msg: "The variable kubernetes_cri_socket is not configured correctly. You might need to move your host to the group kubernetes-cluster or standalone-kubelet!" that: - - kubernetes_cri_socket == "unix:///var/run/dockershim.sock" + - kubernetes_cri_socket == "unix:///var/run/cri-dockerd.sock" - name: create systemd snippet directory file: @@ -14,7 +14,7 @@ copy: content: | [Unit] - After=docker.service + After=cri-dockerd.service dest: /etc/systemd/system/kubelet.service.d/after-docker.conf - name: disable bridge and iptables in docker daemon config and switch to systemd cgroup driver @@ -32,3 +32,26 @@ - name: install docker include_role: name: docker/engine + +- name: install cri-dockerd + apt: + name: cri-dockerd + state: present + +- name: install systemd units for cri-docker + loop: + - socket + - service + template: + src: "cri-dockerd.{{ item }}.j2" + dest: "/etc/systemd/system/cri-dockerd.{{ item }}" + +- name: make sure cri-docker is started and enabled + loop: + - socket + - service + systemd: + daemon_reload: yes + name: "cri-dockerd.{{ item }}" + enabled: yes + state: started |