diff --git a/roles/k3s/node/tasks/prereq/Alpine.yml b/roles/k3s/node/tasks/prereq/Alpine.yml index 5c94907..3492fbb 100644 --- a/roles/k3s/node/tasks/prereq/Alpine.yml +++ b/roles/k3s/node/tasks/prereq/Alpine.yml @@ -28,3 +28,7 @@ name: k3s state: restarted enabled: yes + +- name: lbu + debug: + msg: Remember to commit changes with 'lbu ci -d' to store the k3s passwords diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml index a844772..14556b0 100644 --- a/roles/reset/tasks/main.yml +++ b/roles/reset/tasks/main.yml @@ -1,42 +1,5 @@ ---- -- name: Disable services - systemd: - name: "{{ item }}" - state: stopped - enabled: no - failed_when: false - with_items: - - k3s - - k3s-node - -- 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 - include_tasks: umount_with_children.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 }}" - state: absent - with_items: - - "{{ systemd_dir }}/k3s.service" - - "{{ systemd_dir }}/k3s-node.service" - - /etc/rancher/k3s - - /var/lib/rancher/k3s - - /var/lib/kubelet - - /usr/local/bin/k3s - -- name: daemon_reload - systemd: - daemon_reload: yes +- name: Delete every service and binary + include_tasks: "{{ item }}" + with_first_found: + - "prereq/{{ ansible_distribution }}.yml" + - "prereq/default.yml" diff --git a/roles/reset/tasks/prereq/Alpine.yml b/roles/reset/tasks/prereq/Alpine.yml new file mode 100644 index 0000000..76042ce --- /dev/null +++ b/roles/reset/tasks/prereq/Alpine.yml @@ -0,0 +1,28 @@ +--- +- name: Disable services + service: + name: k3s + state: stopped + enabled: no + +- name: Umount k3s filesystems + include_tasks: umount_with_children.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 }}" + state: absent + with_items: + - /etc/init.d/k3s + - /etc/runlevels/default/k3s + - /etc/rancher/k3s + - /var/lib/rancher/k3s + - /var/lib/kubelet + - /usr/local/bin/k3s diff --git a/roles/reset/tasks/prereq/default.yml b/roles/reset/tasks/prereq/default.yml new file mode 100644 index 0000000..a844772 --- /dev/null +++ b/roles/reset/tasks/prereq/default.yml @@ -0,0 +1,42 @@ +--- +- name: Disable services + systemd: + name: "{{ item }}" + state: stopped + enabled: no + failed_when: false + with_items: + - k3s + - k3s-node + +- 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 + include_tasks: umount_with_children.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 }}" + state: absent + with_items: + - "{{ systemd_dir }}/k3s.service" + - "{{ systemd_dir }}/k3s-node.service" + - /etc/rancher/k3s + - /var/lib/rancher/k3s + - /var/lib/kubelet + - /usr/local/bin/k3s + +- name: daemon_reload + systemd: + daemon_reload: yes diff --git a/roles/reset/tasks/umount_with_children.yml b/roles/reset/tasks/umount_with_children.yml index 8bba596..2cc2499 100644 --- a/roles/reset/tasks/umount_with_children.yml +++ b/roles/reset/tasks/umount_with_children.yml @@ -2,8 +2,6 @@ - name: Get the list of mounted filesystems 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