From 34734c13362230309153b39ed0e8288cf10f653e Mon Sep 17 00:00:00 2001
From: calinah <calina1391@gmail.com>
Date: Mon, 27 Jun 2022 13:20:47 -0700
Subject: [PATCH 1/6] updated to v1.23.8+k0s.0, cleaned up a bit

---
 Vagrant.md                                  | 109 --------------------
 Vagrantfile                                 |  37 -------
 inventory/sample/group_vars/all.yml         |   2 +-
 inventory/sample/inventory.yml              |  60 ++++++-----
 inventory/vagrant/group_vars/all.yml        |  10 --
 inventory/vagrant/inventory.yml             |  27 -----
 roles/download/defaults/main.yml            |   2 +-
 roles/k0s/initial_controller/tasks/main.yml |   8 +-
 roles/k0s/worker/tasks/main.yml             |   2 +-
 supported-k0s-version.json                  |   6 --
 tools/multipass_create_instances.sh         |  40 -------
 tools/multipass_generate_inventory.py       |  85 ---------------
 12 files changed, 44 insertions(+), 344 deletions(-)
 delete mode 100644 Vagrant.md
 delete mode 100644 Vagrantfile
 delete mode 100644 inventory/vagrant/group_vars/all.yml
 delete mode 100644 inventory/vagrant/inventory.yml
 delete mode 100644 supported-k0s-version.json
 delete mode 100755 tools/multipass_create_instances.sh
 delete mode 100755 tools/multipass_generate_inventory.py

diff --git a/Vagrant.md b/Vagrant.md
deleted file mode 100644
index b1dccb8..0000000
--- a/Vagrant.md
+++ /dev/null
@@ -1,109 +0,0 @@
-## Included Playbooks
-
-`site.yml`:
-
-```ShellSession
-$ ansible-playbook site.yml -i inventory/vagrant/inventory.yml
-```
-
-Your inventory must include at least one `initial_controller` and one `worker` node. To get a highly available control plane more `controller` nodes can be added. The first initial controller creates tokens that get written to the nodes when the playbook is executed.
-
-Since vagrant adds a NAT interface to your VMs by default, we have to use a custom k0s.config so that the right network interface is used for k0s, for that we have defined `k0s_use_custom_config: true` in [group_vars/all.yml](inventory/vagrant/group_vars/all.yml)
-
-`reset.yml`:
-
-```ShellSession
-$ ansible-playbook reset.yml -i inventory/vagrant/inventory.yml
-```
-
-Deletes k0s all its files, directories and services from all hosts.
-
-## Example with Vagrant
-
-For the quick creation of virtual machines, there's a [Vagrantfile](Vagrantfile) included  
-By default it creates 5 VMs, to override this , edit the file and define your desired number of VMs at the top of the file (look for `VMS`)
-
-Steps:
-
-- Examine the `Vagrantfile` and make sure the network prefix assigned to the **private_network** is what you expect.
-
-- Make sure you have the plugin `vagrant-vbguest` installed: `vagrant plugin install vagrant-vbguest`
-
-- Create instances with vagrant
-
-```ShellSession
-$ vagrant up
-```
-
-- Edit the [inventory](inventory/vagrant/inventory.yml) file and check if the information is correct
-
-- Test the ssh connection to all instances in your `inventory.yml`:
-
-```ShellSession
-$ ansible -i inventory/vagrant/inventory.yml -m ping all
-k0s-4 | SUCCESS => {
-    "ansible_facts": {
-        "discovered_interpreter_python": "/usr/bin/python3"
-    },
-    "changed": false,
-    "ping": "pong"
-}
-k0s-1 | SUCCESS => {
-...
-```
-
-Create your cluster:
-
-```ShellSession
-$ ansible-playbook site.yml -i inventory/vagrant/inventory.yml
-...
-TASK [k0s/initial_controller : print kubeconfig command] *******************************************************
-Friday 22 January 2021  15:32:44 +0100 (0:00:00.247)       0:04:25.177 ********
-ok: [k0s-1] => {
-    "msg": "To use Cluster: export KUBECONFIG=/Users/dev/k0s-ansible/inventory/vagrant/artifacts/k0s-kubeconfig.yml"
-}
-...
-PLAY RECAP *****************************************************************************************************
-...
-Friday 22 January 2021  15:32:58 +0100 (0:00:00.575)       0:04:39.234 ********
-===============================================================================
-download : Download k0s binary k0s-v0.10.0-beta1-amd64 ------------------------------------------------ 225.86s
-prereq : Install apt packages -------------------------------------------------------------------------- 17.30s
-k0s/initial_controller : Wait for k8s apiserver -------------------------------------------------------- 15.34s
-k0s/controller : Wait for k8s apiserver ----------------------------------------------------------------- 3.36s
-Gathering Facts ----------------------------------------------------------------------------------------- 1.35s
-prereq : Create k0s Directories ------------------------------------------------------------------------- 0.86s
-Gathering Facts ----------------------------------------------------------------------------------------- 0.84s
-k0s/worker : Create k0s worker service with install command --------------------------------------------- 0.80s
-Gathering Facts ----------------------------------------------------------------------------------------- 0.79s
-k0s/initial_controller : Create k0s initial controller service with install command ------------------------- 0.76s
-k0s/initial_controller : Enable and check k0s service --------------------------------------------------- 0.74s
-k0s/controller : Create k0s controller service with install command ----------------------------------------- 0.72s
-prereq : Write the k0s config file ---------------------------------------------------------------------- 0.69s
-Gathering Facts ----------------------------------------------------------------------------------------- 0.68s
-Gathering Facts ----------------------------------------------------------------------------------------- 0.65s
-k0s/worker : Enable and check k0s service --------------------------------------------------------------- 0.58s
-k0s/controller : Enable and check k0s service ----------------------------------------------------------- 0.53s
-k0s/worker : Write the k0s token file on worker --------------------------------------------------------- 0.48s
-k0s/controller : Write the k0s token file on controller ------------------------------------------------- 0.44s
-k0s/initial_controller : Set controller IP in kubeconfig ------------------------------------------------ 0.32s
-```
-
-Connect to your new Kubernetes cluster. The config is ready to use in the `inventory/artifacts` directory:
-
-```ShellSession
-$ export KUBECONFIG=/Users/dev/k0s-ansible/inventory/vagrant/artifacts/k0s-kubeconfig.yml
-$ kubectl get nodes -o wide
-NAME    STATUS   ROLES    AGE   VERSION        INTERNAL-IP     EXTERNAL-IP   OS-IMAGE             KERNEL-VERSION     CONTAINER-RUNTIME
-k0s-4   Ready    <none>   17m   v1.20.2-k0s1   192.168.64.57   <none>        Ubuntu 20.04.1 LTS   5.4.0-62-generic   containerd://1.4.3
-k0s-5   Ready    <none>   17m   v1.20.2-k0s1   192.168.64.58   <none>        Ubuntu 20.04.1 LTS   5.4.0-62-generic   containerd://1.4.3
-$ kubectl run hello-k0s --image=quay.io/prometheus/busybox --rm -it --restart=Never --command -- sh -c "echo hello k0s"
-hello k0s
-pod "hello-k0s" deleted
-```
-
-### Want to throw away your cluster and start all over?
-
-```ShellSession
-$ vagrant destroy -f
-```
diff --git a/Vagrantfile b/Vagrantfile
deleted file mode 100644
index a989641..0000000
--- a/Vagrantfile
+++ /dev/null
@@ -1,37 +0,0 @@
-$script = <<SCRIPT
-sudo apt-get update
-sudo apt-get install -y curl
-echo "IP Addresses:" >>/etc/issue
-for iface in $(ip -br link | awk '!/lo/ { print $1}'); do
-  echo "$iface - \\4{$iface}" >>/etc/issue
-done
-SCRIPT
-
-# How many VMs to create
-VMS = 5
-
-Vagrant.configure("2") do |config|
-  config.vm.box = "ubuntu/bionic64"
-  config.vm.provision "shell", inline: $script
-
-  # Use the same key for each machine
-  # ssh-add ~/.vagrant/insecure_private_key
-  config.ssh.insert_key = false
-
-  config.vbguest.auto_update = false
-
-  config.vm.provider "virtualbox" do |vb|
-    vb.memory = 1024
-    vb.cpus = 2
-    vb.customize ["modifyvm", :id, "--paravirtprovider", "kvm"]
-    vb.customize ["modifyvm", :id, "--audio", "none"]
-  end
-
-  (1..VMS).each do |i|
-    config.vm.define "k0s-#{i}" do |box|
-      box.vm.hostname = "k0s-#{i}"
-      box.vm.network "private_network", ip: "192.168.56.15#{i}"
-    end
-  end
-
-end
diff --git a/inventory/sample/group_vars/all.yml b/inventory/sample/group_vars/all.yml
index 9397366..7625864 100644
--- a/inventory/sample/group_vars/all.yml
+++ b/inventory/sample/group_vars/all.yml
@@ -5,7 +5,7 @@
 # artifacts_dir: "{{ inventory_dir }}/artifacts"
 # systemd_dest: /etc/systemd/system
 # k0s_binary_dest: /usr/local/bin/k0s
-# k0s_config_dir: /etc/k0s
+k0s_config_dir: /etc/k0s
 # k0s_data_dir: /var/lib/k0s
 # k0s_libexec_dir: /usr/libexec/k0s/
 # k0s_use_custom_config: false
diff --git a/inventory/sample/inventory.yml b/inventory/sample/inventory.yml
index f9829cd..54be45f 100644
--- a/inventory/sample/inventory.yml
+++ b/inventory/sample/inventory.yml
@@ -3,31 +3,41 @@ all:
   children:
     initial_controller:
       hosts:
-        k0s-1:
-    controller:
-      hosts:
-        k0s-2:
-        k0s-3:
+        halloumi:
+    # controller:
+    #   hosts:
+    #     feather:
     worker:
       hosts:
-        k0s-4:
-        k0s-5:
-        k0s-6:
-        k0s-7:
-  hosts:
-    k0s-1:
-      ansible_host: 192.168.64.32
-    k0s-2:
-      ansible_host: 192.168.64.33
-    k0s-3:
-      ansible_host: 192.168.64.56
-    k0s-4:
-      ansible_host: 192.168.64.57
-    k0s-5:
-      ansible_host: 192.168.64.58
-    k0s-6:
-      ansible_host: 192.168.64.60
-    k0s-7:
-      ansible_host: 192.168.64.61
+        halloumi:
   vars:
-    ansible_user: k0s
+    ansible_ssh_port: 987
+    ansible_user: root
+    hardened_ssh_port: 987
+    main_user: alice
+    become: true
+  hosts:
+    feather:
+      ansible_host: 142.132.135.204
+    halloumi:
+      ansible_host: 135.181.178.24
+
+# host_init_group:
+#   hosts: &hetzner_hosts
+#     emerald:
+#       ansible_host: 142.132.132.82
+#     feather:
+#       ansible_host: 142.132.135.204
+#     giraffe:
+#       ansible_host: 65.21.112.199
+#     halloumi:
+#       ansible_host: 135.181.178.24
+#     iris: 
+#       ansible_host: 135.181.181.107
+#   vars:
+#     ansible_ssh_port: 22
+#     ansible_user: root
+#     hardened_ssh_port: 987
+#     main_user: alice
+#     become: true
+   
diff --git a/inventory/vagrant/group_vars/all.yml b/inventory/vagrant/group_vars/all.yml
deleted file mode 100644
index 814b9b2..0000000
--- a/inventory/vagrant/group_vars/all.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-# k0s_version: v1.22.4+k0s.1
-# ansible_user: k0s
-# artifacts_dir: "{{ inventory_dir }}/artifacts"
-# systemd_dest: /etc/systemd/system
-# k0s_binary_dest: /usr/local/bin/k0s
-# k0s_config_dir: /etc/k0s
-# k0s_data_dir: /var/lib/k0s
-# k0s_libexec_dir: /usr/libexec/k0s/
-k0s_use_custom_config: true
diff --git a/inventory/vagrant/inventory.yml b/inventory/vagrant/inventory.yml
deleted file mode 100644
index 75d726b..0000000
--- a/inventory/vagrant/inventory.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-all:
-  children:
-    initial_controller:
-      hosts:
-        k0s-1:
-    controller:
-      hosts:
-        k0s-2:
-        k0s-3:
-    worker:
-      hosts:
-        k0s-4:
-        k0s-5:
-  hosts:
-    k0s-1:
-      ansible_host: 192.168.56.151
-    k0s-2:
-      ansible_host: 192.168.56.152
-    k0s-3:
-      ansible_host: 192.168.56.153
-    k0s-4:
-      ansible_host: 192.168.56.154
-    k0s-5:
-      ansible_host: 192.168.56.155
-  vars:
-    ansible_user: vagrant
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 1bb1b3e..7d2e319 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -1,3 +1,3 @@
 ---
-k0s_version: v1.22.4+k0s.1
+k0s_version: v1.23.8+k0s.0
 k0s_binary_dest: /usr/local/bin/k0s
diff --git a/roles/k0s/initial_controller/tasks/main.yml b/roles/k0s/initial_controller/tasks/main.yml
index 79ae70a..31c8532 100644
--- a/roles/k0s/initial_controller/tasks/main.yml
+++ b/roles/k0s/initial_controller/tasks/main.yml
@@ -1,9 +1,13 @@
 ---
+- name: Check if host is already a controller
+  shell: systemctl cat k0scontroller.service
+  register: k0scontroller
 
 - name: Create k0s initial controller service with install command
   register: install_initial_controller_cmd
   command: k0s install controller --config {{ k0s_config_dir }}/k0s.yaml {{ extra_args | default(omit) }}
   changed_when: install_initial_controller_cmd | length > 0
+  when: k0scontroller is failed
 
 - name: Setup custom environment variables for systemd unit
   include_role:
@@ -25,7 +29,7 @@
 
 - name: Create worker join token
   register: worker_join_token
-  command: k0s token create --role worker  --config {{ k0s_config_dir }}/k0s.yaml
+  command: k0s token create --role worker 
   changed_when: worker_join_token | length > 0
 
 - name: Store worker join token
@@ -44,7 +48,7 @@
 
 - name: Create controller join token
   register: controller_join_token
-  command: k0s token create --role controller --config {{ k0s_config_dir }}/k0s.yaml
+  command: k0s token create --role controller 
   changed_when: controller_join_token | length > 0
 
 - name: Store controller join token
diff --git a/roles/k0s/worker/tasks/main.yml b/roles/k0s/worker/tasks/main.yml
index e5c800d..3df0603 100644
--- a/roles/k0s/worker/tasks/main.yml
+++ b/roles/k0s/worker/tasks/main.yml
@@ -10,7 +10,7 @@
 
 - name: Create k0s worker service with install command
   register: install_worker_cmd
-  command: k0s install worker --config {{ k0s_config_dir }}/k0s.yaml --token-file {{ k0s_config_dir }}/worker-token {{ extra_args | default(omit) }}
+  command: k0s install worker --token-file {{ k0s_config_dir }}/worker-token {{ extra_args | default(omit) }}
   changed_when: install_worker_cmd | length > 0
 
 - name: Enable and check k0s service
diff --git a/supported-k0s-version.json b/supported-k0s-version.json
deleted file mode 100644
index 154e216..0000000
--- a/supported-k0s-version.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "schemaVersion": 1,
-  "label": "supports k0s",
-  "message": "v1.22.4+k0s.1",
-  "color": "green"
-}
\ No newline at end of file
diff --git a/tools/multipass_create_instances.sh b/tools/multipass_create_instances.sh
deleted file mode 100755
index 09ac211..0000000
--- a/tools/multipass_create_instances.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-if ! command -v multipass &> /dev/null
-then
-    echo "multipass could not be found"
-    echo "Check <https://github.com/canonical/multipass> on how to install it"
-    exit
-fi
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-
-# Default to 5 VMs
-NUMBER_OF_VMS=${1:-5}
-
-echo "Create cloud-init to import ssh key..."
-
-# https://github.com/canonical/multipass/issues/965#issuecomment-591284180
-cat <<EOF > "${DIR}"/multipass-cloud-init.yml
----
-users:
-  - name: k0s
-    sudo: ALL=(ALL) NOPASSWD:ALL
-    shell: /usr/bin/bash
-    ssh_authorized_keys:
-      - $( cat "$(ls -1 ~/.ssh/id_*.pub | head -1)" )
-EOF
-
-for ((i = 1 ; i <= "${NUMBER_OF_VMS}" ; i++)); do
-  echo "[${i}/${NUMBER_OF_VMS}] Creating instance k0s-${i} with multipass..."
-  multipass launch \
-  --name k0s-"${i}" \
-  --cloud-init "${DIR}"/multipass-cloud-init.yml \
-  --cpus 2 \
-  --mem 2048M \
-  --disk 20G
-done
-
-multipass list 
-
-
-
diff --git a/tools/multipass_generate_inventory.py b/tools/multipass_generate_inventory.py
deleted file mode 100755
index 00b74e2..0000000
--- a/tools/multipass_generate_inventory.py
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/env python3
-import subprocess
-import json
-import yaml
-from yaml import SafeDumper
-from pathlib import Path
-
-
-def get_multipass_instances():
-    try:
-        # pipe multipass json list into dictionary
-        result = subprocess.run(
-            ['multipass', 'list', '--format', 'json'], stdout=subprocess.PIPE).stdout.decode('utf-8')
-        result_dict = json.loads(result)
-        # filter for k0s instances
-        filtered_list = list(
-            filter(lambda k: 'k0s-' in k['name'], result_dict["list"]))
-        return sorted(filtered_list, key=lambda x: x['name'])
-    except Exception as e:
-        print(e)
-
-
-# Ansible inventory template
-inventory = {'all':
-             {'hosts': {},
-              'vars': {'ansible_user': 'k0s'},
-              'children': {
-                  'initial_controller': {'hosts': []},
-                  'controller': {'hosts': []},
-                  'worker': {'hosts': []}
-             }
-             }
-             }
-
-instances = get_multipass_instances()
-
-
-# Parse hosts for inventory
-hosts = {}
-for i in instances:
-    hosts.update({i["name"]: {'ansible_host': i["ipv4"][0]}})
-
-# Assign instances to their tasks.
-# If more than four instances create three controllers
-initial_controller = {}
-controllers = {}
-workers = {}
-
-if len(instances) > 4:
-    for i in instances[0:1]:
-        initial_controller.update({i["name"]: None})
-    for i in instances[1:3]:
-        controllers.update({i["name"]: None})
-    for i in instances[3:]:
-        workers.update({i["name"]: None})
-    print('Designated first three instances as control plane nodes.')
-else:
-    for i in instances[0:1]:
-        initial_controller.update({i["name"]: None})
-    # The others become workers
-    for i in instances[1:]:
-        workers.update({i["name"]: None})
-    print('Designated first instance as control plane node.')
-
-# Fill inventory template with parsed values
-inventory['all']['hosts'] = hosts
-inventory['all']['children']['initial_controller']['hosts'] = initial_controller
-inventory['all']['children']['controller']['hosts'] = controllers
-inventory['all']['children']['worker']['hosts'] = workers
-
-# Dump blanks instead of 'null' by using SafeDumper
-# https://stackoverflow.com/a/37445121
-SafeDumper.add_representer(
-    type(None),
-    lambda dumper, value: dumper.represent_scalar(
-        u'tag:yaml.org,2002:null', '')
-)
-
-# Write inventory as yaml
-yaml_path = Path(__file__).with_name('inventory.yml')
-f = open(yaml_path, 'w')
-f.write(yaml.safe_dump(inventory, default_flow_style=False, explicit_start=True))
-f.close
-
-print(f'Created Ansible Inventory at: {yaml_path}')

From edbaa57ebd8c6d79256349020c773b4f71bb0b2e Mon Sep 17 00:00:00 2001
From: calinah <calina1391@gmail.com>
Date: Tue, 28 Jun 2022 08:46:58 -0700
Subject: [PATCH 2/6] k0s update, new version

---
 README.md                                   | 13 -----
 inventory/sample/group_vars/all.yml         |  2 +-
 inventory/sample/inventory.yml              | 60 +++++++++------------
 roles/k0s/initial_controller/tasks/main.yml |  3 +-
 roles/k0s/worker/tasks/main.yml             |  6 +++
 5 files changed, 34 insertions(+), 50 deletions(-)

diff --git a/README.md b/README.md
index b679263..4e87890 100644
--- a/README.md
+++ b/README.md
@@ -125,19 +125,6 @@ hello k0s
 pod "hello-k0s" deleted
 ```
 
-### Want to throw away your cluster and start all over?
-
-```ShellSession
-$ multipass delete $(multipass list --format csv | grep 'k0s' | cut -d',' -f1)
-$ multipass purge
-```
-
-## Test with Vagrant
-
-It's assumed that vagrant is installed, if not, download and install it from their [website](https://www.vagrantup.com/downloads)
-
-After that consult the [readme](Vagrant.md)
-
 ## How to Contribute
 
 I welcome issues to and pull requests against this repository!
diff --git a/inventory/sample/group_vars/all.yml b/inventory/sample/group_vars/all.yml
index 7625864..7d3a0d6 100644
--- a/inventory/sample/group_vars/all.yml
+++ b/inventory/sample/group_vars/all.yml
@@ -1,6 +1,6 @@
 ---
 # Use this to overwrite the role defaults
-# k0s_version: v1.22.4+k0s.1
+# k0s_version: v1.23.8+k0s.0
 # ansible_user: k0s
 # artifacts_dir: "{{ inventory_dir }}/artifacts"
 # systemd_dest: /etc/systemd/system
diff --git a/inventory/sample/inventory.yml b/inventory/sample/inventory.yml
index 54be45f..f64d4ba 100644
--- a/inventory/sample/inventory.yml
+++ b/inventory/sample/inventory.yml
@@ -3,41 +3,31 @@ all:
   children:
     initial_controller:
       hosts:
-        halloumi:
-    # controller:
-    #   hosts:
-    #     feather:
+        k0s-1:
+    controller:
+      hosts:
+        k0s-2:
+        k0s-3:
     worker:
       hosts:
-        halloumi:
-  vars:
-    ansible_ssh_port: 987
-    ansible_user: root
-    hardened_ssh_port: 987
-    main_user: alice
-    become: true
+        k0s-4:
+        k0s-5:
+        k0s-6:
+        k0s-7:
   hosts:
-    feather:
-      ansible_host: 142.132.135.204
-    halloumi:
-      ansible_host: 135.181.178.24
-
-# host_init_group:
-#   hosts: &hetzner_hosts
-#     emerald:
-#       ansible_host: 142.132.132.82
-#     feather:
-#       ansible_host: 142.132.135.204
-#     giraffe:
-#       ansible_host: 65.21.112.199
-#     halloumi:
-#       ansible_host: 135.181.178.24
-#     iris: 
-#       ansible_host: 135.181.181.107
-#   vars:
-#     ansible_ssh_port: 22
-#     ansible_user: root
-#     hardened_ssh_port: 987
-#     main_user: alice
-#     become: true
-   
+    k0s-1:
+      ansible_host: 192.168.64.32
+    k0s-2:
+      ansible_host: 192.168.64.33
+    k0s-3:
+      ansible_host: 192.168.64.56
+    k0s-4:
+      ansible_host: 192.168.64.57
+    k0s-5:
+      ansible_host: 192.168.64.58
+    k0s-6:
+      ansible_host: 192.168.64.60
+    k0s-7:
+      ansible_host: 192.168.64.61
+  vars:
+    ansible_user: k0s
\ No newline at end of file
diff --git a/roles/k0s/initial_controller/tasks/main.yml b/roles/k0s/initial_controller/tasks/main.yml
index 31c8532..d196471 100644
--- a/roles/k0s/initial_controller/tasks/main.yml
+++ b/roles/k0s/initial_controller/tasks/main.yml
@@ -2,10 +2,11 @@
 - name: Check if host is already a controller
   shell: systemctl cat k0scontroller.service
   register: k0scontroller
+  ignore_errors: yes
 
 - name: Create k0s initial controller service with install command
   register: install_initial_controller_cmd
-  command: k0s install controller --config {{ k0s_config_dir }}/k0s.yaml {{ extra_args | default(omit) }}
+  command: k0s install controller --config {{ k0s_config_dir }}/k0s.yaml --enable-worker {{ extra_args | default(omit) }}
   changed_when: install_initial_controller_cmd | length > 0
   when: k0scontroller is failed
 
diff --git a/roles/k0s/worker/tasks/main.yml b/roles/k0s/worker/tasks/main.yml
index 3df0603..7c18982 100644
--- a/roles/k0s/worker/tasks/main.yml
+++ b/roles/k0s/worker/tasks/main.yml
@@ -1,4 +1,9 @@
 ---
+- name: Check if host is already a controller
+  shell: systemctl cat k0sworker.service
+  register: k0sworker
+  ignore_errors: yes
+
 
 - name: Write the k0s token file on worker
   template:
@@ -12,6 +17,7 @@
   register: install_worker_cmd
   command: k0s install worker --token-file {{ k0s_config_dir }}/worker-token {{ extra_args | default(omit) }}
   changed_when: install_worker_cmd | length > 0
+  when: k0sworker is failed
 
 - name: Enable and check k0s service
   become: true

From 159169bc39749de7b0a5c8a387f314690c7c4654 Mon Sep 17 00:00:00 2001
From: calinah <calina1391@gmail.com>
Date: Mon, 11 Jul 2022 08:04:21 -0700
Subject: [PATCH 3/6] updated k0s role

---
 k0s_backup.yml                              | 30 +++++++++
 reset.yml                                   |  2 +-
 roles/backup/defaults/main.yml              |  3 +
 roles/backup/tasks/main.yml                 | 28 +++++++++
 roles/k0s/controller/tasks/main.yml         | 24 ++++++--
 roles/k0s/controller/tasks/notes.md         |  0
 roles/k0s/initial_controller/tasks/main.yml | 24 +++++++-
 roles/k0s/worker/tasks/main.yml             |  2 +-
 roles/prereq/templates/k0s.yaml.j2          | 19 +++---
 roles/reset/tasks/main.yml                  |  1 +
 roles/restore/defaults/main.yml             |  3 +
 roles/restore/tasks/main.yml                | 28 +++++++++
 site.yml                                    |  3 +-
 upgrade.yml                                 | 67 +++++++++++++++++++++
 14 files changed, 214 insertions(+), 20 deletions(-)
 create mode 100644 k0s_backup.yml
 create mode 100644 roles/backup/defaults/main.yml
 create mode 100644 roles/backup/tasks/main.yml
 create mode 100644 roles/k0s/controller/tasks/notes.md
 create mode 100644 roles/restore/defaults/main.yml
 create mode 100644 roles/restore/tasks/main.yml
 create mode 100644 upgrade.yml

diff --git a/k0s_backup.yml b/k0s_backup.yml
new file mode 100644
index 0000000..83a82ac
--- /dev/null
+++ b/k0s_backup.yml
@@ -0,0 +1,30 @@
+---
+- hosts: controller, initial_controller
+  name: Download k0s on all nodes
+  become: yes
+  roles:
+    - role: backup
+
+# - hosts: initial_controller
+#   gather_facts: yes
+#   become: yes
+#   name: Configure initial k0s control plane node
+#   roles:
+#     - role: k0s/initial_controller
+#       tags: init
+
+# - hosts: controller
+#   gather_facts: yes
+#   become: yes
+#   serial: 1
+#   name: Configure k0s control plane nodes
+#   roles:
+#     - role: k0s/controller
+#       tags: server
+
+# - hosts: worker
+#   become: yes
+#   name: Configure k0s worker nodes
+#   roles:
+#     - role: k0s/worker
+#       tags: worker
diff --git a/reset.yml b/reset.yml
index 8041442..4499d4a 100644
--- a/reset.yml
+++ b/reset.yml
@@ -1,6 +1,6 @@
 ---
 
-- hosts: all
+- hosts: k0s
   gather_facts: yes
   become: yes
   roles:
diff --git a/roles/backup/defaults/main.yml b/roles/backup/defaults/main.yml
new file mode 100644
index 0000000..7d2e319
--- /dev/null
+++ b/roles/backup/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+k0s_version: v1.23.8+k0s.0
+k0s_binary_dest: /usr/local/bin/k0s
diff --git a/roles/backup/tasks/main.yml b/roles/backup/tasks/main.yml
new file mode 100644
index 0000000..c36b838
--- /dev/null
+++ b/roles/backup/tasks/main.yml
@@ -0,0 +1,28 @@
+---
+- name: set k0s_backup_dir fact
+  set_fact:
+    k0s_backup_dir: "/k0s-backup"
+  run_once: true
+  when: k0s_backup_dir is not defined
+
+- name: create k0s_backup_dir path
+  file:
+    path: "{{ k0s_backup_dir }}"
+    state: directory
+    owner: "{{ ansible_user }}"
+    mode: 0775
+
+- name: Backup k0s controller 
+  register: backup_controller_state
+  command: k0s backup --save-path={{ k0s_backup_dir }} -
+
+- name: List backups data dir contents
+  find:
+    paths: "{{ k0s_backup_dir }}"
+    recurse: yes
+    file_type: any
+  register: k0s_backup_file
+
+- debug: 
+    msg: "{{ k0s_backup_file }}"
+
diff --git a/roles/k0s/controller/tasks/main.yml b/roles/k0s/controller/tasks/main.yml
index fd83331..b4956af 100644
--- a/roles/k0s/controller/tasks/main.yml
+++ b/roles/k0s/controller/tasks/main.yml
@@ -10,7 +10,7 @@
 
 - name: Create k0s controller service with install command
   register: install_controller_cmd
-  command: k0s install controller --config {{ k0s_config_dir }}/k0s.yaml --token-file {{ k0s_config_dir }}/controller-token {{ extra_args | default(omit) }}
+  command: k0s install controller --config {{ k0s_config_dir }}/k0s.yaml --token-file {{ k0s_config_dir }}/controller-token --enable-k0s-cloud-provider=true {{ extra_args | default(omit) }}
   changed_when: install_controller_cmd | length > 0
 
 - name: Setup custom environment variables for systemd unit
@@ -25,8 +25,20 @@
     state: restarted
     enabled: yes
 
-- name: "Wait for k8s apiserver"
-  wait_for:
-    host: localhost
-    port: 6443
-    timeout: 180
+# - name: "Wait for k8s apiserver"
+#   become: true
+#   wait_for:
+#     host: localhost
+#     port: 6443
+#     timeout: 300
+
+# - name: Wait for k8s apiserver
+#   become: true
+#   wait_for:
+#     host: localhost
+#     port: 6443
+#     delay: 15
+#     timeout: 180
+
+- name: Wait for node to come online
+  shell: sleep 200
\ No newline at end of file
diff --git a/roles/k0s/controller/tasks/notes.md b/roles/k0s/controller/tasks/notes.md
new file mode 100644
index 0000000..e69de29
diff --git a/roles/k0s/initial_controller/tasks/main.yml b/roles/k0s/initial_controller/tasks/main.yml
index d196471..cd938c6 100644
--- a/roles/k0s/initial_controller/tasks/main.yml
+++ b/roles/k0s/initial_controller/tasks/main.yml
@@ -6,7 +6,7 @@
 
 - name: Create k0s initial controller service with install command
   register: install_initial_controller_cmd
-  command: k0s install controller --config {{ k0s_config_dir }}/k0s.yaml --enable-worker {{ extra_args | default(omit) }}
+  command: k0s install controller --config {{ k0s_config_dir }}/k0s.yaml --enable-worker --enable-k0s-cloud-provider=true {{ extra_args | default(omit) }}
   changed_when: install_initial_controller_cmd | length > 0
   when: k0scontroller is failed
 
@@ -74,12 +74,34 @@
     owner: "{{ ansible_user }}"
     mode: 0644
 
+- name: "Read a file content"
+  shell: |
+    cat ~{{ ansible_user }}/k0s-kubeconfig.yml
+  register: file_content1
+
+- name: "Print the file content to a console"
+  debug:
+    msg: "{{ file_content1.stdout }}"
+
 - name: Set controller IP in kubeconfig
   replace:
     path: ~{{ ansible_user }}/k0s-kubeconfig.yml
     regexp: 'localhost'
     replace: "{{ ansible_host }}"
 
+
+- name: Set controller IP in kubeconfig
+  debug: 
+  
+- name: "Read a file content"
+  shell: |
+    cat ~{{ ansible_user }}/k0s-kubeconfig.yml
+  register: file_content
+
+- name: "Print the file content to a console"
+  debug:
+    msg: "{{ file_content.stdout }}"
+
 - name: Copy kubeconfig
   fetch:
     src: "~{{ ansible_user }}/k0s-kubeconfig.yml"
diff --git a/roles/k0s/worker/tasks/main.yml b/roles/k0s/worker/tasks/main.yml
index 7c18982..19a1cca 100644
--- a/roles/k0s/worker/tasks/main.yml
+++ b/roles/k0s/worker/tasks/main.yml
@@ -15,7 +15,7 @@
 
 - name: Create k0s worker service with install command
   register: install_worker_cmd
-  command: k0s install worker --token-file {{ k0s_config_dir }}/worker-token {{ extra_args | default(omit) }}
+  command: k0s install worker --token-file {{ k0s_config_dir }}/worker-token --enable-cloud-provider=true {{ extra_args | default(omit) }}
   changed_when: install_worker_cmd | length > 0
   when: k0sworker is failed
 
diff --git a/roles/prereq/templates/k0s.yaml.j2 b/roles/prereq/templates/k0s.yaml.j2
index cbc929b..88fe61f 100644
--- a/roles/prereq/templates/k0s.yaml.j2
+++ b/roles/prereq/templates/k0s.yaml.j2
@@ -12,12 +12,13 @@ spec:
   storage:
     type: etcd
     etcd:
-      peerAddress: {{ ansible_host }}
+      peerAddress: localhost
   network:
     podCIDR: 10.244.0.0/16
     serviceCIDR: 10.96.0.0/12
     provider: kuberouter
-    calico: null
+    calico: 
+      wireguard: true
     kuberouter:
       mtu: 0
       peerRouterIPs: ""
@@ -38,30 +39,30 @@ spec:
   images:
     konnectivity:
       image: us.gcr.io/k8s-artifacts-prod/kas-network-proxy/proxy-agent
-      version: v0.0.13
+      version: v0.0.25
     metricsserver:
       image: gcr.io/k8s-staging-metrics-server/metrics-server
-      version: v0.3.7
+      version: v0.5.0
     kubeproxy:
       image: k8s.gcr.io/kube-proxy
-      version: v1.20.4
+      version: v1.24.2
     coredns:
       image: docker.io/coredns/coredns
       version: 1.7.0
     calico:
       cni:
         image: docker.io/calico/cni
-        version: v3.16.2
+        version: v3.18.1
       node:
         image: docker.io/calico/node
-        version: v3.16.2
+        version: v3.18.1
       kubecontrollers:
         image: docker.io/calico/kube-controllers
-        version: v3.16.2
+        version: v3.18.1
     kuberouter:
       cni:
         image: docker.io/cloudnativelabs/kube-router
-        version: v1.1.1
+        version: v1.2.1
       cniInstaller:
         image: quay.io/k0sproject/cni-node
         version: 0.1.0
diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml
index 9289f42..39a87dc 100644
--- a/roles/reset/tasks/main.yml
+++ b/roles/reset/tasks/main.yml
@@ -27,6 +27,7 @@
     - "{{ k0s_config_dir }}"
     - "{{ k0s_data_dir }}"
     - "{{ k0s_libexec_dir }}"
+    - "{{ k0s_binary_dest }}"
     - /var/lib/kubelet
     - "{{ systemd_dest }}/k0scontroller.service"
     - "{{ systemd_dest }}/k0sworker.service"
diff --git a/roles/restore/defaults/main.yml b/roles/restore/defaults/main.yml
new file mode 100644
index 0000000..7d2e319
--- /dev/null
+++ b/roles/restore/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+k0s_version: v1.23.8+k0s.0
+k0s_binary_dest: /usr/local/bin/k0s
diff --git a/roles/restore/tasks/main.yml b/roles/restore/tasks/main.yml
new file mode 100644
index 0000000..c36b838
--- /dev/null
+++ b/roles/restore/tasks/main.yml
@@ -0,0 +1,28 @@
+---
+- name: set k0s_backup_dir fact
+  set_fact:
+    k0s_backup_dir: "/k0s-backup"
+  run_once: true
+  when: k0s_backup_dir is not defined
+
+- name: create k0s_backup_dir path
+  file:
+    path: "{{ k0s_backup_dir }}"
+    state: directory
+    owner: "{{ ansible_user }}"
+    mode: 0775
+
+- name: Backup k0s controller 
+  register: backup_controller_state
+  command: k0s backup --save-path={{ k0s_backup_dir }} -
+
+- name: List backups data dir contents
+  find:
+    paths: "{{ k0s_backup_dir }}"
+    recurse: yes
+    file_type: any
+  register: k0s_backup_file
+
+- debug: 
+    msg: "{{ k0s_backup_file }}"
+
diff --git a/site.yml b/site.yml
index 6660a41..d4130a8 100644
--- a/site.yml
+++ b/site.yml
@@ -1,6 +1,5 @@
 ---
-
-- hosts: all
+- hosts: k0s
   name: Download k0s on all nodes
   become: yes
   roles:
diff --git a/upgrade.yml b/upgrade.yml
new file mode 100644
index 0000000..c382112
--- /dev/null
+++ b/upgrade.yml
@@ -0,0 +1,67 @@
+---
+# As upgrading a node  requires special attention,
+# this block uses an inventory on the fly with add_host
+# to prompt the user for hostname
+- hosts: localhost
+  gather_facts: yes
+  vars_prompt:
+  - name: target_host
+    prompt: "Specify which node to upgrade:"
+    private: no
+
+  tasks:
+    - add_host:
+        name: "{{ target_host }}"
+        groups: dynamically_created_hosts
+
+    - set_fact:
+        target_host: "{{ target_host }}"
+    
+# End of inventory on the fly block
+
+    - name: drain node
+      local_action:
+        module: shell
+        _raw_params: "kubectl --kubeconfig $KUBECONFIG drain {{ target_host }} --force --ignore-daemonsets --delete-emptydir-data"
+      become: false
+      register: node_drain_out
+
+    - name: set k8s_version_upgrade_eviction_seconds fact
+      set_fact:
+        k8s_version_upgrade_eviction_seconds: 45
+      run_once: true
+      when: k8s_version_upgrade_eviction_seconds is undefined
+
+    - name: allow some time for the evictions
+      pause:
+        seconds: "{{ k8s_version_upgrade_eviction_seconds }}"
+
+- hosts: dynamically_created_hosts
+  name: "Upgrading k0s version to {{ k0s_version }}"
+  become: yes
+  tasks:
+    - shell: k0s stop
+
+- hosts: dynamically_created_hosts
+  name: Download new version of k0s 
+  become: yes
+  roles:
+    - role: download
+      tags: download
+
+- hosts: dynamically_created_hosts
+  name: start the k0s service
+  become: yes
+  tasks:
+    - shell: k0s start 
+
+- hosts: localhost
+  gather_facts: yes
+  tasks:
+  - name: uncordon node
+    local_action:
+      module: shell
+      _raw_params: "kubectl --kubeconfig $KUBECONFIG uncordon {{ target_host }}"
+    become: false
+
+    
\ No newline at end of file

From 9acc86fefae327db63b42939f041c0a9a204fad7 Mon Sep 17 00:00:00 2001
From: calinah <calina1391@gmail.com>
Date: Wed, 13 Jul 2022 23:32:05 -0700
Subject: [PATCH 4/6] tested with hetzner cloud

---
 roles/k0s/initial_controller/tasks/main.yml | 17 ++++++++++-------
 roles/prereq/templates/k0s.yaml.j2          | 10 ++++++----
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/roles/k0s/initial_controller/tasks/main.yml b/roles/k0s/initial_controller/tasks/main.yml
index cd938c6..82ba934 100644
--- a/roles/k0s/initial_controller/tasks/main.yml
+++ b/roles/k0s/initial_controller/tasks/main.yml
@@ -21,12 +21,15 @@
     state: restarted
     enabled: yes
 
-- name: Wait for k8s apiserver
-  wait_for:
-    host: localhost
-    port: 6443
-    delay: 15
-    timeout: 180
+# - name: Wait for k8s apiserver
+#   wait_for:
+#     host: localhost
+#     port: 6443
+#     delay: 15
+#     timeout: 180
+- name: Wait for node to come online
+  shell: sleep 60
+
 
 - name: Create worker join token
   register: worker_join_token
@@ -87,7 +90,7 @@
   replace:
     path: ~{{ ansible_user }}/k0s-kubeconfig.yml
     regexp: 'localhost'
-    replace: "{{ ansible_host }}"
+    replace: "{{ lb_address }}"
 
 
 - name: Set controller IP in kubeconfig
diff --git a/roles/prereq/templates/k0s.yaml.j2 b/roles/prereq/templates/k0s.yaml.j2
index 88fe61f..896a448 100644
--- a/roles/prereq/templates/k0s.yaml.j2
+++ b/roles/prereq/templates/k0s.yaml.j2
@@ -4,15 +4,17 @@ metadata:
   name: k0s
 spec:
   api:
-    address: {{ ansible_host }}
+    externalAddress: {{ lb_address }}
+    address: {{ ansible_default_ipv4.address }}
     port: 6443
     k0sApiPort: 9443
     sans:
-    - {{ ansible_host }}
+    - {{ lb_address }}
   storage:
-    type: etcd
     etcd:
-      peerAddress: localhost
+      peerAddress: {{ ansible_default_ipv4.address }}
+      externalCluster: null
+    type: etcd
   network:
     podCIDR: 10.244.0.0/16
     serviceCIDR: 10.96.0.0/12

From 544dd0a4661f89dbb73a78a96ae9f1442ec8a8df Mon Sep 17 00:00:00 2001
From: calinah <calina1391@gmail.com>
Date: Mon, 18 Jul 2022 07:38:37 -0700
Subject: [PATCH 5/6] working aws cluster with HA masters- tested

---
 roles/k0s/initial_controller/tasks/main.yml | 4 ++--
 roles/reset/tasks/main.yml                  | 1 +
 roles/reset/tasks/umount_with_children.yml  | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/roles/k0s/initial_controller/tasks/main.yml b/roles/k0s/initial_controller/tasks/main.yml
index 82ba934..9dbcc3a 100644
--- a/roles/k0s/initial_controller/tasks/main.yml
+++ b/roles/k0s/initial_controller/tasks/main.yml
@@ -23,12 +23,12 @@
 
 # - name: Wait for k8s apiserver
 #   wait_for:
-#     host: localhost
+#     host: "{{ lb_address }}"
 #     port: 6443
 #     delay: 15
 #     timeout: 180
 - name: Wait for node to come online
-  shell: sleep 60
+  shell: sleep 120
 
 
 - name: Create worker join token
diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml
index 39a87dc..64c31fc 100644
--- a/roles/reset/tasks/main.yml
+++ b/roles/reset/tasks/main.yml
@@ -1,6 +1,7 @@
 ---
 
 - name: Disable k0s service
+  become: true
   systemd:
     name: "{{ item }}"
     state: stopped
diff --git a/roles/reset/tasks/umount_with_children.yml b/roles/reset/tasks/umount_with_children.yml
index c8e4b1b..ac3b1ac 100644
--- a/roles/reset/tasks/umount_with_children.yml
+++ b/roles/reset/tasks/umount_with_children.yml
@@ -11,6 +11,7 @@
   changed_when: get_mounted_filesystems.stdout | length > 0
 
 - name: Umount filesystem
+  become: true
   mount:
     path: "{{ item }}"
     state: unmounted

From 5201c32e9167ecb71d37dcbc85adc415af57d128 Mon Sep 17 00:00:00 2001
From: calinah <calina1391@gmail.com>
Date: Fri, 12 Aug 2022 19:36:16 -0700
Subject: [PATCH 6/6] fully tested k0s cluster

---
 site.yml => install_k0s_cluster.yml         |  0
 roles/k0s/controller/tasks/main.yml         | 23 +++++------------
 roles/k0s/controller/tasks/notes.md         |  0
 roles/k0s/initial_controller/tasks/main.yml | 16 ++++++------
 roles/reset/tasks/main.yml                  | 28 ++++++++++++++++++---
 roles/reset/tasks/umount_with_children.yml  |  6 ++++-
 6 files changed, 42 insertions(+), 31 deletions(-)
 rename site.yml => install_k0s_cluster.yml (100%)
 delete mode 100644 roles/k0s/controller/tasks/notes.md

diff --git a/site.yml b/install_k0s_cluster.yml
similarity index 100%
rename from site.yml
rename to install_k0s_cluster.yml
diff --git a/roles/k0s/controller/tasks/main.yml b/roles/k0s/controller/tasks/main.yml
index b4956af..1a7440d 100644
--- a/roles/k0s/controller/tasks/main.yml
+++ b/roles/k0s/controller/tasks/main.yml
@@ -25,20 +25,9 @@
     state: restarted
     enabled: yes
 
-# - name: "Wait for k8s apiserver"
-#   become: true
-#   wait_for:
-#     host: localhost
-#     port: 6443
-#     timeout: 300
-
-# - name: Wait for k8s apiserver
-#   become: true
-#   wait_for:
-#     host: localhost
-#     port: 6443
-#     delay: 15
-#     timeout: 180
-
-- name: Wait for node to come online
-  shell: sleep 200
\ No newline at end of file
+- name: "Wait for k8s apiserver"
+  become: true
+  wait_for:
+    host: localhost
+    port: 6443
+    timeout: 300
\ No newline at end of file
diff --git a/roles/k0s/controller/tasks/notes.md b/roles/k0s/controller/tasks/notes.md
deleted file mode 100644
index e69de29..0000000
diff --git a/roles/k0s/initial_controller/tasks/main.yml b/roles/k0s/initial_controller/tasks/main.yml
index 9dbcc3a..e40ecd5 100644
--- a/roles/k0s/initial_controller/tasks/main.yml
+++ b/roles/k0s/initial_controller/tasks/main.yml
@@ -6,7 +6,7 @@
 
 - name: Create k0s initial controller service with install command
   register: install_initial_controller_cmd
-  command: k0s install controller --config {{ k0s_config_dir }}/k0s.yaml --enable-worker --enable-k0s-cloud-provider=true {{ extra_args | default(omit) }}
+  command: k0s install controller --config {{ k0s_config_dir }}/k0s.yaml --enable-k0s-cloud-provider=true {{ extra_args | default(omit) }}
   changed_when: install_initial_controller_cmd | length > 0
   when: k0scontroller is failed
 
@@ -21,14 +21,12 @@
     state: restarted
     enabled: yes
 
-# - name: Wait for k8s apiserver
-#   wait_for:
-#     host: "{{ lb_address }}"
-#     port: 6443
-#     delay: 15
-#     timeout: 180
-- name: Wait for node to come online
-  shell: sleep 120
+- name: Wait for k8s apiserver
+  wait_for:
+    host: localhost
+    port: 6443
+    delay: 15
+    timeout: 300
 
 
 - name: Create worker join token
diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml
index 64c31fc..c5d60ac 100644
--- a/roles/reset/tasks/main.yml
+++ b/roles/reset/tasks/main.yml
@@ -2,7 +2,7 @@
 
 - name: Disable k0s service
   become: true
-  systemd:
+  service:
     name: "{{ item }}"
     state: stopped
     enabled: no
@@ -11,11 +11,24 @@
     - k0scontroller
     - k0sworker
 
+- name: Ensure no other k0s services are running
+  ignore_errors: yes
+  shell: "ps -few | grep [k]0s| awk '{print $2}'"
+  register: running_processes
+
+- name: Kill running processes
+  ignore_errors: yes
+  shell: "kill {{ item }}"
+  with_items: "{{ running_processes.stdout_lines }}"
+
 - name: Umount k0s filesystems
   include_tasks: umount_with_children.yml
   with_items:
     - "{{ k0s_data_dir }}"
     - "{{ k0s_libexec_dir }}"
+    - "{{ k0s_config_dir }}"
+    # - /var/lib/kubelet
+    # - /run/k0s
   loop_control:
     loop_var: mounted_fs
 
@@ -29,10 +42,17 @@
     - "{{ k0s_data_dir }}"
     - "{{ k0s_libexec_dir }}"
     - "{{ k0s_binary_dest }}"
-    - /var/lib/kubelet
+    # - /var/lib/kubelet
+    # - /run/k0s
     - "{{ systemd_dest }}/k0scontroller.service"
     - "{{ systemd_dest }}/k0sworker.service"
+  retries: 5
+  delay: 5
+  register: result
+  until: result is not failed
 
 - name: daemon_reload
-  systemd:
-    daemon_reload: yes
+  become: true
+  command: systemctl 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 ac3b1ac..f394a2f 100644
--- a/roles/reset/tasks/umount_with_children.yml
+++ b/roles/reset/tasks/umount_with_children.yml
@@ -14,6 +14,10 @@
   become: true
   mount:
     path: "{{ item }}"
-    state: unmounted
+    state: absent
+  retries: 3
+  delay: 5
+  register: result
+  until: result is not failed
   with_items:
     "{{ get_mounted_filesystems.stdout_lines }}"