move more stuff to configmap-env, remove configmap, bump appVersion, add externalValkey.existingSecretKeys.port, regenerate docs, clean up deployment.yaml
This commit is contained in:
@@ -86,7 +86,28 @@ data:
|
||||
# mail
|
||||
MAIL_DRIVER: "{{ .Values.pixelfed.mail.driver }}"
|
||||
MAIL_ENCRYPTION: "{{ .Values.pixelfed.mail.encryption }}"
|
||||
MAIL_FROM_ADDRESS: "{{ .Values.pixelfed.mail.from_address }}"
|
||||
MAIL_FROM_NAME: "{{ .Values.pixelfed.mail.from_name }}"
|
||||
|
||||
# database configuration
|
||||
DB_CONNECTION: {{ .Values.pixelfed.db.connection }}
|
||||
DB_APPLY_NEW_MIGRATIONS_AUTOMATICALLY: "{{ .Values.pixelfed.db.apply_new_migrations_automatically }}"
|
||||
{{- if .Values.postgresql.enabled }}
|
||||
DB_PORT: {{ .Values.postgresql.primary.service.ports.postgresql | quote }}
|
||||
DB_HOST: {{ .Values.postgresql.fullnameOverride }}
|
||||
DB_USERNAME: postgres
|
||||
DB_DATABASE: postgres
|
||||
{{- end }}
|
||||
|
||||
# redis
|
||||
{{- if .Values.valkey.enabled }}
|
||||
REDIS_HOST: {{ printf "%s-primary" (.Values.valkey.fullnameOverride) }}
|
||||
{{- else if and .Values.externalValkey.enabled (not .Values.externalValkey.existingSecret) (not .Values.externalValkey.existingSecretKeys.host) }}
|
||||
REDIS_HOST: {{ .Values.externalValkey.port | quote }}
|
||||
{{- end }}
|
||||
|
||||
{{- if .Values.valkey.enabled }}
|
||||
REDIS_PORT: {{ .Values.valkey.primary.service.ports.valkey | quote }}
|
||||
{{- else if .Values.externalValkey.enabled (not .Values.externalValkey.existingSecret) (not .Values.externalValkey.existingSecretKeys.port) }}
|
||||
REDIS_PORT: {{ .Values.externalValkey.port | quote }}
|
||||
{{- end }}
|
||||
|
||||
Reference in New Issue
Block a user