Add existingSecret example to values.yaml and add existing secret to fail condition

This commit is contained in:
fkf9 2021-09-07 13:12:43 +02:00
parent d642502019
commit d412270689
2 changed files with 15 additions and 5 deletions

View file

@ -1,9 +1,9 @@
{{- $needsVolumePermissions := and .Values.volumePermissions.enabled (or .Values.persistence.enabled .Values.persistence.existingClaim) }} {{- $needsVolumePermissions := and .Values.volumePermissions.enabled (or .Values.persistence.enabled .Values.persistence.existingClaim) }}
{{- if (and .Values.postgresql.enabled (not .Values.postgresql.postgresqlPassword)) -}} {{- if (and .Values.postgresql.enabled (and (not .Values.postgresql.postgresqlPassword) (not .Values.postgresql.existingSecret))) -}}
{{- fail "You must specify a static postgres password 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 (not .Values.redis.password))) -}} {{- if (and .Values.redis.enabled (and .Values.redis.usePassword (and (not .Values.redis.password) (not .Values.redis.existingSecret)))) -}}
{{- fail "You must specify a static redis password 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 -}}
--- ---
# Server: {{ required "A valid serverName is required" .Values.serverName }} # Server: {{ required "A valid serverName is required" .Values.serverName }}

View file

@ -592,6 +592,11 @@ postgresql:
# XXX Change me! # XXX Change me!
postgresqlPassword: synapse postgresqlPassword: synapse
## Or use existing secret with "postgresql-password" key
## instead of static password
##
# existingSecret: postgresql-secret
postgresqlUsername: synapse postgresqlUsername: synapse
postgresqlDatabase: synapse postgresqlDatabase: synapse
@ -629,10 +634,15 @@ externalPostgresql:
redis: redis:
enabled: true enabled: true
# XXX Change me!
usePassword: true usePassword: true
# XXX Change me!
password: synapse password: synapse
## Or use existing secret with "redis-password" key
## instead of static password
##
# existingSecret: redis-secret
cluster: cluster:
enabled: false enabled: false
master: master: