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

Merge branch 'master' into 'master'

Browse source 
Use existingSecret over password if set

See merge request ananace/charts!20
This commit is contained in:
Alexander Olofsson 2021-09-23 09:16:18 +00:00
commit 057003d38c
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -81,16 +81,14 @@ spec:
-c /synapse/config/homeserver.yaml \ -c /synapse/config/homeserver.yaml \
-c /synapse/config/conf.d/ -c /synapse/config/conf.d/
env: env:
{{- $postgresPass := include "matrix-synapse.postgresql.password" . }} {{- if .Values.postgresql.enabled }}
{{- if and .Values.postgresql.enabled (not $postgresPass) }}
- name: POSTGRES_PASSWORD - name: POSTGRES_PASSWORD
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ .Values.postgresql.existingSecret | default (include "matrix-synapse.postgresql.fullname" .) }} name: {{ .Values.postgresql.existingSecret | default (include "matrix-synapse.postgresql.fullname" .) }}
key: postgresql-password key: postgresql-password
{{- end }} {{- end }}
{{- $redisPass := include "matrix-synapse.redis.password" . }} {{- if and .Values.redis.enabled (default .Values.redis.usePassword true) }}
{{- if and .Values.redis.enabled (default .Values.redis.usePassword true) (not $redisPass) }}
- name: REDIS_PASSWORD - name: REDIS_PASSWORD
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:

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

@ -44,7 +44,7 @@ stringData:
name: "psycopg2" name: "psycopg2"
args: args:
user: {{ $postgresUser | quote }} user: {{ $postgresUser | quote }}
{{- if $postgresPass }} {{- if and $postgresPass (not .Values.postgresql.existingSecret) }}
password: {{ $postgresPass | quote }} password: {{ $postgresPass | quote }}
{{- else }} {{- else }}
password: "@@POSTGRES_PASSWORD@@" password: "@@POSTGRES_PASSWORD@@"
@ -67,7 +67,7 @@ stringData:
enabled: true enabled: true
host: {{ $redisHost | quote }} host: {{ $redisHost | quote }}
{{- if or .Values.redis.usePassword .Values.redis.password .Values.externalRedis.password }} {{- if or .Values.redis.usePassword .Values.redis.password .Values.externalRedis.password }}
{{- if $redisPass }} {{- if and $redisPass (not .Values.redis.existingSecret) }}
password: {{ $redisPass | quote }} password: {{ $redisPass | quote }}
{{- else }} {{- else }}
password: "@@REDIS_PASSWORD@@" password: "@@REDIS_PASSWORD@@"