From 7f05af704acd54b6cf9e7bab62019004d2ec9479 Mon Sep 17 00:00:00 2001 From: Tim Jens Krause Date: Mon, 3 Feb 2025 13:58:40 +0100 Subject: [PATCH] ArgoCD update to 2.13.4 --- charts/argocd/Changelog.MD | 18 +++++++++++++++++- .../templates/projects/helm-registries.yaml | 12 +++++++++--- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/charts/argocd/Changelog.MD b/charts/argocd/Changelog.MD index d8bc1df5..cf0e9062 100644 --- a/charts/argocd/Changelog.MD +++ b/charts/argocd/Changelog.MD @@ -1,6 +1,22 @@ ### Chart Version: 16.3.2 - AppVersion update to 2.13.4 - - No other migrations necessary + - Added the possibility to set the `enableOCI` flag on the helm-registries + + Example of oci Helm Charts: +```hcl +infrastructure-charts = { + helmRegistries = { + bitnamiCharts = { + url = "registry-1.docker.io/bitnamicharts" + enableOCI = true + } + } + ... +} +``` + + + ### Chart Version: 16.3.1 - AppVersion update to 2.12.4 diff --git a/charts/argocd/templates/projects/helm-registries.yaml b/charts/argocd/templates/projects/helm-registries.yaml index b08908be..642ee4e4 100644 --- a/charts/argocd/templates/projects/helm-registries.yaml +++ b/charts/argocd/templates/projects/helm-registries.yaml @@ -7,14 +7,20 @@ metadata: name: {{ $registryName }}-helm labels: argocd.argoproj.io/secret-type: repository - app.kubernetes.io/part-of: argocd data: name: {{ printf $registryName| b64enc }} - password: {{ printf $registry.password | b64enc }} project: {{ $projectName | b64enc }} type: {{ printf "helm" | b64enc }} url: {{ $registry.url | b64enc }} - username: {{ printf ($registry.username | default "ARGOCD_GIT_ACCESS_TOKEN") | b64enc }} + + {{- if $registry.password }} + username: {{ $registry.username | default "ARGOCD_GIT_ACCESS_TOKEN" | b64enc }} + password: {{ printf $registry.password | b64enc }} + {{- end }} + + {{- if $registry.enableOCI }} + enableOCI: {{ $registry.enableOCI | toString | b64enc }} + {{- end }} --- {{- end }} {{- end }} \ No newline at end of file