From c1be7209e377f043ae567b1db3fb2add579b3235 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 8 May 2021 00:16:13 +0200
Subject: standalone kubelets using containerd

---
 roles/kubernetes/base/tasks/cri_containerd.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'roles/kubernetes/base/tasks/cri_containerd.yml')

diff --git a/roles/kubernetes/base/tasks/cri_containerd.yml b/roles/kubernetes/base/tasks/cri_containerd.yml
index 66398ef2..441360f7 100644
--- a/roles/kubernetes/base/tasks/cri_containerd.yml
+++ b/roles/kubernetes/base/tasks/cri_containerd.yml
@@ -5,6 +5,21 @@
     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: override mandatory settings in containerd_config
+  set_fact:
+    containerd_config: "{{ containerd_config | default({}) | combine(containerd_config_override, recursive=True) }}"
+
 - name: install containerd
   include_role:
     name: containerd
-- 
cgit v1.2.3


From 15b53903e14a7c7ddbb086fc94c42d7d2916b4df Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 8 May 2021 23:34:34 +0200
Subject: enable zfs snapshotter for containerd

---
 roles/containerd/tasks/main.yml                |  6 ++++++
 roles/kubernetes/base/tasks/cri_containerd.yml | 11 ++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'roles/kubernetes/base/tasks/cri_containerd.yml')

diff --git a/roles/containerd/tasks/main.yml b/roles/containerd/tasks/main.yml
index a082e27b..10371243 100644
--- a/roles/containerd/tasks/main.yml
+++ b/roles/containerd/tasks/main.yml
@@ -6,6 +6,12 @@
   include_role:
     name: "storage/{{ containerd_storage.type }}/volume"
 
+- name: create child-dataset for zfs-snapshotter
+  when: "containerd_storage is defined and containerd_storage.type == 'zfs'"
+  zfs:
+    name: "{{ containerd_storage.pool }}/{{ containerd_storage.name }}/io.containerd.snapshotter.v1.zfs"
+    state: present
+
 - name: prepare package provider
   when: containerd_pkg_provider != 'distro'
   include_role:
diff --git a/roles/kubernetes/base/tasks/cri_containerd.yml b/roles/kubernetes/base/tasks/cri_containerd.yml
index 441360f7..97775b14 100644
--- a/roles/kubernetes/base/tasks/cri_containerd.yml
+++ b/roles/kubernetes/base/tasks/cri_containerd.yml
@@ -16,9 +16,18 @@
                 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) }}"
+    containerd_config: "{{ containerd_config | default({}) | combine(containerd_config_override, recursive=True) | combine((containerd_config_override_zfs | default({})), recursive=True) }}"
 
 - name: install containerd
   include_role:
-- 
cgit v1.2.3