From 78c1d7fb546edb1b041f9e35a445896d4379a78e Mon Sep 17 00:00:00 2001 From: Danny Bessems Date: Thu, 15 Dec 2022 22:17:07 +0100 Subject: [PATCH] Housekeeping; --- .../firstboot/files/ansible_payload/templates/registries.j2 | 6 +++--- ansible/vars/metacluster.yml | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ansible/roles/firstboot/files/ansible_payload/templates/registries.j2 b/ansible/roles/firstboot/files/ansible_payload/templates/registries.j2 index 6a6016c..45cde78 100644 --- a/ansible/roles/firstboot/files/ansible_payload/templates/registries.j2 +++ b/ansible/roles/firstboot/files/ansible_payload/templates/registries.j2 @@ -1,8 +1,8 @@ mirrors: -{% for value in _template.data %} - {{ value }}: +{% for entry in _template.data %} + {{ entry }}: endpoint: - https://registry.{{ _template.hv.fqdn }} rewrite: - "(.*)": "library/{{ value }}/$1" + "(.*)": "library/{{ entry }}/$1" {% endfor %} diff --git a/ansible/vars/metacluster.yml b/ansible/vars/metacluster.yml index 643d720..a416e9c 100644 --- a/ansible/vars/metacluster.yml +++ b/ansible/vars/metacluster.yml @@ -99,7 +99,6 @@ components: gitea: helm: - # version: v6.0.0 # (= Gitea v1.17.1) version: v6.0.3 # (= Gitea v1.17.3) chart: gitea-charts/gitea parse_logic: helm template . | yq --no-doc eval '.. | .image? | select(.)' | sort -u | sed '/:/!s/$/:latest/' @@ -131,7 +130,6 @@ components: harbor: helm: - # version: 1.9.1 # (= Harbor v2.5.1) version: 1.10.2 # (= Harbor v2.6.2) chart: harbor/harbor parse_logic: helm template . | yq --no-doc eval '.. | .image? | select(.)' | sort -u | awk '!/ /' @@ -170,7 +168,7 @@ components: sealed-secrets: helm: - # version: 2.4.0 # (= SealedSecrets v0.18.1) + # Must match the version referenced within `https://code.spamasaurus.com/djpbessems/GitOps.MetaCluster.git` version: 2.7.1 # (= SealedSecrets v0.19.2) chart: sealed-secrets/sealed-secrets parse_logic: helm template . | yq --no-doc eval '.. | .image? | select(.)' | sort -u | awk '!/ /'