argoproj
/
argo-helm
mirror of https://github.com/argoproj/argo-helm.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

fix(argo-cd): Same Secret name and key for all embedded redis options 

Signed-off-by: Marco Maurer <mkilchhofer@users.noreply.github.com>
pull/3238/head
Marco Maurer 2025-04-03 19:26:55 +02:00
parent 697a5bd7dc
commit 804d4f10bd
No known key found for this signature in database
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
charts/argo-cd/Chart.yaml
View File

@ -3,7 +3,7 @@ appVersion: v2.14.9
kubeVersion: ">=1.25.0-0"
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd
version: 7.8.22
version: 7.8.23
home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
sources:
@ -26,5 +26,5 @@ annotations:
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
artifacthub.io/changes: |
- kind: changed
description: Bump argo-cd to v2.14.9
- kind: fixed
description: Secret for embedded Redis deployments now always uses the same name and key

22
charts/argo-cd/templates/_helpers.tpl
View File

@ -295,21 +295,23 @@ optional: true
secretKeyRef of env variable REDIS_PASSWORD
*/}}
{{- define "argo-cd.redisPasswordSecretRef" -}}
{{- if and .Values.redisSecretInit.enabled (not .Values.externalRedis.host) -}}
{{- if .Values.externalRedis.host -}}
{{- /* External Redis use case */ -}}
{{- /* Secret is required when specifying existingSecret or a password, otherwise it is optional */ -}}
name: {{ default "argocd-redis" .Values.externalRedis.existingSecret }}
key: redis-password
optional: {{ if or .Values.externalRedis.existingSecret .Values.externalRedis.password }}false{{ else }}true{{ end }}
{{- else if and .Values.redisSecretInit.enabled -}}
{{- /* Default case where Secret is generated by the Job with Helm pre-install hooks */ -}}
name: "argocd-redis" # hard-coded in Job command "argocd admin redis-initial-password"
name: "argocd-redis" # hard-coded in Job command and embedded Redis deployments (standalone and redis-ha)
key: auth
optional: false # Secret is not optional in this case !
{{- else if .Values.externalRedis.host -}}
{{- /* External Redis use case */ -}}
{{- /* Secret is required when specifying existingSecret, otherwise it is optional */ -}}
name: {{ default (include "argo-cd.redis.fullname" .) .Values.externalRedis.existingSecret }}
key: redis-password
optional: {{ if .Values.externalRedis.existingSecret }}false{{ else }}true{{ end }}
{{- else -}}
{{- /* All other use cases (e.g. disabled pre-install Job) */ -}}
name: {{ include "argo-cd.redis.fullname" . }}
key: redis-password
name: "argocd-redis"
key: auth
optional: true
{{- end -}}
{{- end -}}