From 4058ee42e640f3a600f02a3a2304b7e688438c17 Mon Sep 17 00:00:00 2001 From: Staf Wagemakers Date: Wed, 22 Jul 2020 18:43:06 +0200 Subject: [PATCH 1/6] 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 }}" From e2c4882dba0cd7a2c38abad5673d258b1a655c45 Mon Sep 17 00:00:00 2001 From: Staf Wagemakers Date: Wed, 22 Jul 2020 20:48:40 +0200 Subject: [PATCH 2/6] fixed ansible lint error: set -o pipefail added. --- roles/reset/tasks/umount_with_childeren.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/reset/tasks/umount_with_childeren.yml b/roles/reset/tasks/umount_with_childeren.yml index 8fa132d..041faa3 100644 --- a/roles/reset/tasks/umount_with_childeren.yml +++ b/roles/reset/tasks/umount_with_childeren.yml @@ -1,7 +1,9 @@ --- - name: Get the list of mounted filesystems - shell: cat /proc/mounts | awk '{ print $2}' | grep -E "^{{ mounted_fs }}" + shell: set -o pipefail && cat /proc/mounts | awk '{ print $2}' | grep -E "^{{ mounted_fs }}" register: get_mounted_filesystems + args: + executable: /bin/bash failed_when: False changed_when: get_mounted_filesystems.stdout | length > 0 From 637e49d75e9f055840123c27caeaafb1a6b6fb54 Mon Sep 17 00:00:00 2001 From: Staf Wagemakers Date: Fri, 24 Jul 2020 14:16:10 +0200 Subject: [PATCH 3/6] use lowercase for booleans --- roles/reset/tasks/main.yml | 6 +++--- roles/reset/tasks/umount_with_childeren.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml index 3f44085..4ee16ea 100644 --- a/roles/reset/tasks/main.yml +++ b/roles/reset/tasks/main.yml @@ -4,15 +4,15 @@ 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 + failed_when: false + changed_when: false - name: Umount k3s filesystems include_tasks: umount_with_childeren.yml diff --git a/roles/reset/tasks/umount_with_childeren.yml b/roles/reset/tasks/umount_with_childeren.yml index 041faa3..8bba596 100644 --- a/roles/reset/tasks/umount_with_childeren.yml +++ b/roles/reset/tasks/umount_with_childeren.yml @@ -4,7 +4,7 @@ register: get_mounted_filesystems args: executable: /bin/bash - failed_when: False + failed_when: false changed_when: get_mounted_filesystems.stdout | length > 0 - name: Umount filesystem From afc6c8add741ec03e6bde1ea81fa9fa1a914d163 Mon Sep 17 00:00:00 2001 From: Staf Wagemakers Date: Fri, 24 Jul 2020 15:46:07 +0200 Subject: [PATCH 4/6] updated to verify the exit code of killall, only report a change if something is killed --- roles/reset/tasks/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml index 4ee16ea..88aad71 100644 --- a/roles/reset/tasks/main.yml +++ b/roles/reset/tasks/main.yml @@ -10,9 +10,10 @@ - k3s-node - name: Killall containerd-shim-runc-v2 + register: killall_containerd_shim_runc_v2 command: killall -9 containerd-shim-runc-v2 + changed_when: "killall_containerd_shim_runc_v2.rc == 0" failed_when: false - changed_when: false - name: Umount k3s filesystems include_tasks: umount_with_childeren.yml From e8b0b89d5dae536c496fe8bebd4eb861e96b3344 Mon Sep 17 00:00:00 2001 From: Staf Wagemakers Date: Fri, 24 Jul 2020 20:15:48 +0200 Subject: [PATCH 5/6] use pkill on the full command line instead of killall --- roles/reset/tasks/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml index 88aad71..bddbe73 100644 --- a/roles/reset/tasks/main.yml +++ b/roles/reset/tasks/main.yml @@ -9,10 +9,10 @@ - k3s - k3s-node -- name: Killall containerd-shim-runc-v2 - register: killall_containerd_shim_runc_v2 - command: killall -9 containerd-shim-runc-v2 - changed_when: "killall_containerd_shim_runc_v2.rc == 0" +:- name: pkill -9 -f "k3s/data/[^/]+/bin/containerd-shim-runc" + register: pkill_containerd_shim_runc + command: pkill -9 -f "k3s/data/[^/]+/bin/containerd-shim-runc" + changed_when: "pkill_containerd_shim_runc.rc == 0" failed_when: false - name: Umount k3s filesystems From 7bab4cb165291835022745303478256c02975fb1 Mon Sep 17 00:00:00 2001 From: Staf Wagemakers Date: Fri, 24 Jul 2020 20:21:38 +0200 Subject: [PATCH 6/6] removed typo ':' --- roles/reset/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml index bddbe73..c4bce07 100644 --- a/roles/reset/tasks/main.yml +++ b/roles/reset/tasks/main.yml @@ -9,7 +9,7 @@ - k3s - k3s-node -:- name: pkill -9 -f "k3s/data/[^/]+/bin/containerd-shim-runc" +- name: pkill -9 -f "k3s/data/[^/]+/bin/containerd-shim-runc" register: pkill_containerd_shim_runc command: pkill -9 -f "k3s/data/[^/]+/bin/containerd-shim-runc" changed_when: "pkill_containerd_shim_runc.rc == 0"