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_containerd.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_containerd.yml')
-rw-r--r-- | roles/kubernetes/base/tasks/cri_containerd.yml | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/roles/kubernetes/base/tasks/cri_containerd.yml b/roles/kubernetes/base/tasks/cri_containerd.yml index 66398ef2..97775b14 100644 --- a/roles/kubernetes/base/tasks/cri_containerd.yml +++ b/roles/kubernetes/base/tasks/cri_containerd.yml @@ -5,6 +5,30 @@ that: - kubernetes_cri_socket == "unix:///run/containerd/containerd.sock" +- name: switch to systemd cgroup driver + set_fact: + containerd_config_override: + plugins: + "io.containerd.grpc.v1.cri": + containerd: + runtimes: + runc: + options: + SystemdCgroup: true + +- name: switch to zfs-snapshotter for cri + when: "containerd_storage is defined and containerd_storage.type == 'zfs'" + set_fact: + containerd_config_override_zfs: + plugins: + "io.containerd.grpc.v1.cri": + containerd: + snapshotter: "zfs" + +- name: override mandatory settings in containerd_config + set_fact: + containerd_config: "{{ containerd_config | default({}) | combine(containerd_config_override, recursive=True) | combine((containerd_config_override_zfs | default({})), recursive=True) }}" + - name: install containerd include_role: name: containerd |