Merge branch 'Kubernetes.Bootstrap.Appliance' of https://code.spamasaurus.com/djpbessems/Packer.Images into Kubernetes.Bootstrap.Appliance

ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/certauthority.yml

@@ -34,6 +34,10 @@
         - argo-cd
         - kube-system
 
+  tags:
+    - never
+    - final
+
 - name: Configure step-ca passthrough ingress
   ansible.builtin.template:
     src: ingressroutetcp.j2
@@ -70,6 +74,9 @@
             - name: LEGO_CA_CERTIFICATES
               value: /step-ca/root_ca.crt
     marker: '    # {mark} ANSIBLE MANAGED BLOCK'
+  tags:
+    - never
+    - final
   notify:
     - Apply manifests
 

ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/git.yml

@@ -36,15 +36,11 @@
       ansible.builtin.meta: flush_handlers
 
     - name: Ensure gitea API availability
-      ansible.utils.cli_parse:
+      ansible.builtin.uri:
-        # Available from Gitea 1.17.x
+        url: https://git.{{ vapp['metacluster.fqdn'] }}/api/healtz
-        # command: curl -k https://git.{{ vapp['metacluster.fqdn'] }}/api/healtz
+        method: GET
-        command: curl -k https://git.{{ vapp['metacluster.fqdn'] }}/api/v1/version
+      register: api_readycheck
-        parser:
+      until: api_readycheck.json.status | default(false) | bool
-          name: ansible.utils.json
-        set_fact: api_readycheck
-      ignore_errors:
-      until: api_readycheck.version is defined
       retries: 3
       delay: 30
 

ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/gitops.yml

@@ -11,13 +11,11 @@
         values: "{{ components.argocd.chart_values }}"
 
     - name: Ensure argo-cd API availability
-      ansible.utils.cli_parse:
+      ansible.builtin.uri:
-        command: curl -k https://gitops.{{ vapp['metacluster.fqdn'] }}/api/version
+        url: https://gitops.{{ vapp['metacluster.fqdn'] }}/api/version
-        parser:
+        method: GET
-          name: ansible.utils.json
+      register: api_readycheck
-        set_fact: api_readycheck
+      until: api_readycheck.json.Version | default(false) | bool
-      ignore_errors:
-      until: api_readycheck.Version is defined
       retries: 3
       delay: 30
 

ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/k3s.yml

@@ -12,13 +12,11 @@
   when: ansible_facts.services['k3s.service'] is undefined
 
 - name: Ensure API availability
-  ansible.utils.cli_parse:
+  ansible.builtin.uri:
-    command: curl -k https://{{ vapp['guestinfo.ipaddress'] }}:6443/livez?verbose
+    url: https://{{ vapp['guestinfo.ipaddress'] }}:6443/livez?verbose
-    parser:
+    method: GET
-      name: ansible.utils.json
+  register: api_readycheck
-    set_fact: api_readycheck
+  until: api_readycheck.json.apiVersion | default(false) | bool
-  ignore_errors: yes
-  until: api_readycheck.apiVersion is defined
   retries: 3
   delay: 30
 

ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml

@@ -6,4 +6,7 @@
 - import_tasks: registry.yml
 - import_tasks: git.yml
 - import_tasks: gitops.yml
+
+- import_tasks: certauthority.yml
+  tags: final
 - import_tasks: cleanup.yml