port kubernetes/base to new storage volume roles

3 files changed, 6 insertions, 39 deletions

diff --git a/roles/kubernetes/base/tasks/lvm.yml b/roles/kubernetes/base/tasks/lvm.yml
deleted file mode 100644
index 3ef36e89..00000000
--- a/roles/kubernetes/base/tasks/lvm.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: create logical volume
-  lvol:
-    vg: "{{ kubelet_lvm.vg }}"
-    lv: "{{ kubelet_lvm.lv }}"
-    size: "{{ kubelet_lvm.size }}"
-
-- name: create filesystem
-  filesystem:
-    fstype: "{{ kubelet_lvm.fs }}"
-    dev: "/dev/mapper/{{ kubelet_lvm.vg | replace('-', '--') }}-{{ kubelet_lvm.lv | replace('-', '--') }}"
-
-- name: mount filesytem
-  mount:
-    src: "/dev/mapper/{{ kubelet_lvm.vg | replace('-', '--') }}-{{ kubelet_lvm.lv | replace('-', '--') }}"
-    path: /var/lib/kubelet
-    fstype: "{{ kubelet_lvm.fs }}"
-    state: mounted
diff --git a/roles/kubernetes/base/tasks/main.yml b/roles/kubernetes/base/tasks/main.yml
index e33792cc..80fd67a1 100644
--- a/roles/kubernetes/base/tasks/main.yml
+++ b/roles/kubernetes/base/tasks/main.yml
@@ -2,13 +2,12 @@
 - name: install container runtime
   include_tasks: "cri_{{ kubernetes_container_runtime }}.yml"
 
-- name: prepare /var/lib/kubelet as LVM
-  when: kubelet_lvm is defined
-  import_tasks: lvm.yml
-
-- name: prepare /var/lib/kubelet as ZFS dataset
-  when: kubelet_zfs is defined
-  import_tasks: zfs.yml
+- name: prepare storage volume for /var/lib/kubelet
+  when: kubelet_storage is defined
+  vars:
+    storage_volume: "{{ kubelet_storage | combine({'dest': '/var/lib/kubelet'})}}"
+  include_role:
+    name: "storage/{{ kubelet_storage.type }}/volume"
 
 - name: add apt repository
   include_role:
diff --git a/roles/kubernetes/base/tasks/zfs.yml b/roles/kubernetes/base/tasks/zfs.yml
deleted file mode 100644
index b675ee6a..00000000
--- a/roles/kubernetes/base/tasks/zfs.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- name: create zfs dataset
-  zfs:
-    name: "{{ kubelet_zfs.pool }}/{{ kubelet_zfs.name }}"
-    state: present
-    extra_zfs_properties: "{{ kubelet_zfs.properties | default(omit) }}"
-
-- name: bind mount filesytem
-  mount:
-    src: "{{ zfs_pools[kubelet_zfs.pool].mountpoint }}/{{ kubelet_zfs.name }}"
-    path: /var/lib/kubelet
-    fstype: none
-    opts: bind,x-systemd.automount,nofail
-    state: mounted