add support for existingSecret with Postgres and Redis
This commit is contained in:
parent
f475b7eefe
commit
33a84425eb
2 changed files with 4 additions and 4 deletions
|
@ -86,7 +86,7 @@ spec:
|
||||||
- name: POSTGRES_PASSWORD
|
- name: POSTGRES_PASSWORD
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ 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" . }}
|
{{- $redisPass := include "matrix-synapse.redis.password" . }}
|
||||||
|
@ -94,7 +94,7 @@ spec:
|
||||||
- name: REDIS_PASSWORD
|
- name: REDIS_PASSWORD
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ include "matrix-synapse.redis.fullname" . }}
|
name: {{ .Values.redis.existingSecret | default (include "matrix-synapse.redis.fullname" .) }}
|
||||||
key: redis-password
|
key: redis-password
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- with .Values.synapse.extraEnv }}
|
{{- with .Values.synapse.extraEnv }}
|
||||||
|
|
|
@ -87,14 +87,14 @@ spec:
|
||||||
- name: POSTGRES_PASSWORD
|
- name: POSTGRES_PASSWORD
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ include "matrix-synapse.postgresql.fullname" $ }}
|
name: {{ .Values.postgresql.existingSecret | default (include "matrix-synapse.postgresql.fullname" $) }}
|
||||||
key: postgresql-password
|
key: postgresql-password
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if and $.Values.redis.enabled (default $.Values.redis.usePassword true) }}
|
{{- if and $.Values.redis.enabled (default $.Values.redis.usePassword true) }}
|
||||||
- name: REDIS_PASSWORD
|
- name: REDIS_PASSWORD
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ include "matrix-synapse.redis.fullname" $ }}
|
name: {{ .Values.redis.existingSecret | default (include "matrix-synapse.redis.fullname" $) }}
|
||||||
key: redis-password
|
key: redis-password
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- with $config.extraEnv | default $default.extraEnv }}
|
{{- with $config.extraEnv | default $default.extraEnv }}
|
||||||
|
|
Loading…
Reference in a new issue