From 4058ee42e640f3a600f02a3a2304b7e688438c17 Mon Sep 17 00:00:00 2001
From: Staf Wagemakers <staf@wagemakers.be>
Date: Wed, 22 Jul 2020 18:43:06 +0200
Subject: [PATCH] killall containerd-shim-runc-v2 added

umount k3s filesystems added
---
 roles/reset/tasks/main.yml                  | 17 ++++++++++++++++-
 roles/reset/tasks/umount_with_childeren.yml | 13 +++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 roles/reset/tasks/umount_with_childeren.yml

diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml
index 4e0cf1c..3f44085 100644
--- a/roles/reset/tasks/main.yml
+++ b/roles/reset/tasks/main.yml
@@ -4,11 +4,26 @@
     name: "{{ item }}"
     state: stopped
     enabled: no
-  failed_when: false
+  failed_when: False
   with_items:
     - k3s
     - k3s-node
 
+- name: Killall containerd-shim-runc-v2
+  command: killall -9 containerd-shim-runc-v2
+  failed_when: False
+  changed_when: False
+
+- name: Umount k3s filesystems
+  include_tasks: umount_with_childeren.yml
+  with_items:
+    - /run/k3s
+    - /var/lib/kubelet
+    - /run/netns
+    - /var/lib/rancher/k3s
+  loop_control:
+    loop_var: mounted_fs
+
 - name: Remove service files, binaries and data
   file:
     name: "{{ item }}"
diff --git a/roles/reset/tasks/umount_with_childeren.yml b/roles/reset/tasks/umount_with_childeren.yml
new file mode 100644
index 0000000..8fa132d
--- /dev/null
+++ b/roles/reset/tasks/umount_with_childeren.yml
@@ -0,0 +1,13 @@
+---
+- name: Get the list of mounted filesystems
+  shell: cat /proc/mounts | awk '{ print $2}' | grep -E "^{{ mounted_fs }}"
+  register: get_mounted_filesystems
+  failed_when: False
+  changed_when: get_mounted_filesystems.stdout | length > 0
+
+- name: Umount filesystem
+  mount:
+    path: "{{ item }}"
+    state: unmounted
+  with_items:
+    "{{ get_mounted_filesystems.stdout_lines }}"