changed k3s conditionals to host patterns + server tweaks

Author: wtripp180901

ansible/bootstrap.yml

@@ -313,12 +313,11 @@
     - include_role:
         name: azimuth_cloud.image_utils.linux_ansible_init
 
-- hosts: k3s
+- hosts: k3s:&builder
   become: yes
   tags: k3s
   tasks:
     - name: Install k3s
-      when: "'builder' in group_names"
       ansible.builtin.include_role:
         name: k3s
         tasks_from: install.yml

ansible/extras.yml

@@ -1,19 +1,17 @@
-- hosts: k3s_server
+- hosts: k3s_server:!builder
   become: yes
   tags: k3s
   tasks:
     - name: Start k3s server
-      when: "'builder' not in group_names"
       ansible.builtin.include_role:
         name: k3s
         tasks_from: server-runtime.yml
 
-- hosts: k3s_agent
+- hosts: k3s_agent:!builder
   become: yes
   tags: k3s
   tasks:
     - name: Start k3s agents
-      when: "'builder' not in group_names"
       vars: # set outside of role to allow compute init to define own value
         k3s_bootstrap_token: "{{ hostvars[groups['k3s_server'] | first]._k3s_token_output.stdout | default('') }}"
       ansible.builtin.include_role:

ansible/roles/k3s/tasks/server-runtime.yml

@@ -15,11 +15,10 @@
 
 # Possible race here as there is a delay between agents disconnecting and being registered as down, probably won't be hit in general use though
 - name: Check if k3s agents are connected
-  ignore_errors: true
   ansible.builtin.shell:
     cmd: kubectl get nodes --no-headers | grep -w Ready
   register: _k3s_connected_nodes
-  retries: 5 # there may be a delay before the server reconnects to itself
+  retries: 6 # there may be a delay before the server reconnects to itself
   delay: 10
   until: not _k3s_connected_nodes.failed