DevFW-CICD/argocd-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(argo-cd): Fix Redis race condition due to optional REDIS_PASSWORD (#2839)

Browse source 
Signed-off-by: yu-croco <yu.croco@gmail.com>
This commit is contained in:
Aikawa 2024-08-09 00:02:08 +09:00 committed by GitHub
parent 2251079c26
commit 817182bdb0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
charts/argo-cd/Chart.yaml
View file

@ -3,7 +3,7 @@ appVersion: v2.12.0
kubeVersion: ">=1.25.0-0" kubeVersion: ">=1.25.0-0"
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 7.4.1 version: 7.4.2
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
sources: sources:
@ -27,4 +27,4 @@ annotations:
url: https://argoproj.github.io/argo-helm/pgp_keys.asc url: https://argoproj.github.io/argo-helm/pgp_keys.asc
artifacthub.io/changes: | artifacthub.io/changes: |
- kind: fixed - kind: fixed
description: added ttlsecondsafterfinished in redis-secret-init job to prevent a stuck in waiting for completion of hook batch/Job/argocd-redis-secret-init description: Fix Redis race condition due to optional REDIS_PASSWORD

2
charts/argo-cd/templates/argocd-application-controller/statefulset.yaml
View file

@ -207,10 +207,10 @@ spec:
name: {{ default "argocd-redis" .Values.externalRedis.existingSecret }} name: {{ default "argocd-redis" .Values.externalRedis.existingSecret }}
{{- if .Values.externalRedis.host }} {{- if .Values.externalRedis.host }}
key: redis-password key: redis-password
optional: true
{{- else }} {{- else }}
key: auth key: auth
{{- end }} {{- end }}
optional: true
- name: REDIS_SENTINEL_USERNAME - name: REDIS_SENTINEL_USERNAME
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:

2
charts/argo-cd/templates/argocd-repo-server/deployment.yaml
View file

@ -182,9 +182,9 @@ spec:
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ default "argocd-redis" .Values.externalRedis.existingSecret }} name: {{ default "argocd-redis" .Values.externalRedis.existingSecret }}
optional: true
{{- if .Values.externalRedis.host }} {{- if .Values.externalRedis.host }}
key: redis-password key: redis-password
optional: true
{{- else }} {{- else }}
key: auth key: auth
{{- end }} {{- end }}

2
charts/argo-cd/templates/argocd-server/deployment.yaml
View file

@ -250,9 +250,9 @@ spec:
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ default "argocd-redis" .Values.externalRedis.existingSecret }} name: {{ default "argocd-redis" .Values.externalRedis.existingSecret }}
optional: true
{{- if .Values.externalRedis.host }} {{- if .Values.externalRedis.host }}
key: redis-password key: redis-password
optional: true
{{- else }} {{- else }}
key: auth key: auth
{{- end }} {{- end }}