From 72202d9f219b6480b8ce4134367d678aab46cb31 Mon Sep 17 00:00:00 2001 From: Danny Bessems Date: Sun, 26 Jun 2022 22:30:10 +0200 Subject: [PATCH] Fix missing parenthesis;Attempt parsing argo-cd chart --- ansible/roles/metacluster/tasks/components.yml | 4 ++-- ansible/vars/metacluster.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/roles/metacluster/tasks/components.yml b/ansible/roles/metacluster/tasks/components.yml index fc036ef..32c0848 100644 --- a/ansible/roles/metacluster/tasks/components.yml +++ b/ansible/roles/metacluster/tasks/components.yml @@ -39,8 +39,8 @@ - name: Compress tarballs community.general.archive: - dest: /opt/metacluster/container-images/{{ item | regex_findall('[^/:]+'))[-2] }}.tar.gz - path: /opt/metacluster/container-images/{{ item | regex_findall('[^/:]+'))[-2] }}.tar + dest: /opt/metacluster/container-images/{{ ( item | regex_findall('[^/:]+'))[-2] }}.tar.gz + path: /opt/metacluster/container-images/{{ ( item | regex_findall('[^/:]+'))[-2] }}.tar remove: yes ignore_errors: yes loop: "{{ containerimages.results | map(attribute='stdout_lines') | flatten }}" diff --git a/ansible/vars/metacluster.yml b/ansible/vars/metacluster.yml index 6ad6a82..b6caf07 100644 --- a/ansible/vars/metacluster.yml +++ b/ansible/vars/metacluster.yml @@ -28,7 +28,7 @@ components: 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")' + parse_logic: yq e '.. | select(has("repository")) |= (with(select(.tag == "" or .tag == null); .repository + ":v2.4.2") | with(select(.tag != "" and .tag != null); .repository + ":" + .tag))' dependencies: @@ -43,7 +43,7 @@ dependencies: archive: compressed extra_opts: --strip-components=1 - filename: yq - url: http://github.com/mikefarah/yq/releases/download/v4.25.2/yq_linux_amd64 + url: http://github.com/mikefarah/yq/releases/download/v4.25.3/yq_linux_amd64 packages: - skopeo