more merge conflicts

Author: wtripp180901

ansible/bootstrap.yml

@@ -261,6 +261,7 @@
 
 - hosts: k3s
   become: yes
+  tags: k3s
   tasks:
     - ansible.builtin.include_role:
         name: k3s

ansible/cleanup.yml

@@ -39,7 +39,7 @@
 - name: Cleanup /tmp
   command : rm -rf /tmp/*
 
-- name: Delete ansible-init sentintel file created during build
+- name: Delete ansible-init sentinel file created if ansible-init has run during build
   ansible.builtin.file:
     path: /var/lib/ansible-init.done
     state: absent

ansible/roles/k3s/tasks/main.yml

@@ -23,7 +23,7 @@
     - server
     - agent
 
-- name: Installing helm
+- name: Install helm
   unarchive:
     src: https://get.helm.sh/helm-v3.11.0-linux-amd64.tar.gz
     dest: /usr/bin