pub/charts
1
0
Fork 0
Code Issues Pull requests Releases Packages 19 Activity Actions

Merge branch 'master' into 'master'

Browse source 
use correct key for redis existingSecret

See merge request ananace/charts!40
This commit is contained in:
Alexander Olofsson 2022-10-28 13:07:03 +00:00
commit 6604c1bb3d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
charts/matrix-synapse/templates/deployment.yaml
View file

@ -2,7 +2,7 @@
{{- if (and .Values.postgresql.enabled (and (not .Values.postgresql.postgresqlPassword) (not .Values.postgresql.existingSecret))) -}} {{- if (and .Values.postgresql.enabled (and (not .Values.postgresql.postgresqlPassword) (not .Values.postgresql.existingSecret))) -}}
{{- fail "You must specify a static postgres password or existing secret if using the included postgres chart" -}} {{- fail "You must specify a static postgres password or existing secret if using the included postgres chart" -}}
{{- end -}} {{- end -}}
{{- if (and .Values.redis.enabled (and .Values.redis.usePassword (and (not .Values.redis.auth.password) (not .Values.redis.existingSecret)))) -}} {{- if (and .Values.redis.enabled (and .Values.redis.usePassword (and (not .Values.redis.auth.password) (not .Values.redis.auth.existingSecret)))) -}}
{{- fail "You must specify a static redis password or existing secret if using the included redis chart" -}} {{- fail "You must specify a static redis password or existing secret if using the included redis chart" -}}
{{- end -}} {{- end -}}
--- ---
@ -98,7 +98,7 @@ spec:
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
{{- if .Values.redis.enabled }} {{- if .Values.redis.enabled }}
name: {{ .Values.redis.existingSecret | default (include "matrix-synapse.redis.fullname" .) }} name: {{ .Values.redis.auth.existingSecret | default (include "matrix-synapse.redis.fullname" .) }}
key: redis-password key: redis-password
{{- else }} {{- else }}
name: {{ .Values.externalRedis.existingSecret }} name: {{ .Values.externalRedis.existingSecret }}