Add missing galaxy collection;Fix logic to parse charts for container images;Add ArgoCD

ansible/requirements.yml

@@ -1,2 +1,4 @@
 collections:
+  - ansible.utils
+  - community.general
   - kubernetes.core

ansible/roles/appliance/tasks/dependencies.archive_compressed.yml

@@ -4,7 +4,7 @@
     state: directory
   register: archive
 
-- name: Download, extract & install archived static binary
+- name: Download & extract archived static binary
   ansible.builtin.unarchive:
     src: "{{ item.url }}"
     dest: "{{ archive.path }}"

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

@@ -16,4 +16,3 @@
   until: api_readycheck.apiVersion is defined
   retries: 3
   delay: 30
-

ansible/roles/metacluster/tasks/components.yml

@@ -16,7 +16,7 @@
 
 - name: Fetch helm charts
   ansible.builtin.command:
-    cmd: helm fetch {{ item.value.helm_chart }} --untar --version {{ item.value.version }}
+    cmd: helm fetch {{ item.value.helm.chart }} --untar --version {{ item.value.helm.version }}
     chdir: /opt/metacluster/helm-charts
   loop: "{{ lookup('ansible.builtin.dict', components) }}"
   loop_control:
@@ -24,7 +24,7 @@
 
 - name: Parse helm charts for container images
   ansible.builtin.command:
-    cmd: "{{ item.value.parse_logic }} /opt/metacluster/helm-charts/{{ item.key }}/values.yaml"
+    cmd: "{{ item.value.helm.parse_logic }} /opt/metacluster/helm-charts/{{ item.key }}/values.yaml"
   register: containerimages
   loop: "{{ lookup('ansible.builtin.dict', components) }}"
   loop_control:

ansible/vars/metacluster.yml

@@ -7,25 +7,33 @@ platform:
       url: https://charts.longhorn.io
     - name: harbor
       url: https://helm.goharbor.io
+    - name: argo
+      url: https://argoproj.github.io/argo-helm
 
 components:
 
   longhorn:
-    version: 1.3.0
+    helm:
-    helm_chart: longhorn/longhorn
+      version: 1.3.0
-    parse_logic: yq e '.. | select(has("repository")) | .repository + ":" + .tag'
+      chart: longhorn/longhorn
+      parse_logic: yq e '.. | select(has("repository")) | .repository + ":" + .tag'
 
   harbor:
-    version: 1.9.1      # (= Harbor v2.5.1)
+    helm:
-    helm_chart: harbor/harbor
+      version: 1.9.1  # (= Harbor v2.5.1)
-    parse_logic: yq e '.. | select(has("repository")) | .repository + ":" + .tag'
+      chart: harbor/harbor
+      parse_logic: yq e '.. | select(has("repository")) | .repository + ":" + .tag'
 
-#  argocd:
+  argocd:
-#    version:
+    helm:
+      version: 4.9.7  # (= ArgoCD v2.4.2)
+      chart: argo/argo-cd
+      parse_logic: yq e '.. | select(has("repository")) | .repository + ":" + (.tag // "v2.4.2")'
 
 dependencies:
 
   ansible_galaxy_collections:
+    - ansible.utils
     - community.general
     - kubernetes.core