properly use external secrets for mail and database
This commit is contained in:
@@ -201,7 +201,7 @@ spec:
|
|||||||
name: {{ .Values.pixelfed.mail.existingSecret }}
|
name: {{ .Values.pixelfed.mail.existingSecret }}
|
||||||
key: {{ .Values.pixelfed.mail.existingSecretKeys.host }}
|
key: {{ .Values.pixelfed.mail.existingSecretKeys.host }}
|
||||||
{{- else }}
|
{{- else }}
|
||||||
name: mail-secret
|
name: pixelfed-mail
|
||||||
key: host
|
key: host
|
||||||
{{- end }}
|
{{- end }}
|
||||||
- name: MAIL_PORT
|
- name: MAIL_PORT
|
||||||
@@ -211,7 +211,7 @@ spec:
|
|||||||
name: {{ .Values.pixelfed.mail.existingSecret }}
|
name: {{ .Values.pixelfed.mail.existingSecret }}
|
||||||
key: {{ .Values.pixelfed.mail.existingSecretKeys.port }}
|
key: {{ .Values.pixelfed.mail.existingSecretKeys.port }}
|
||||||
{{- else }}
|
{{- else }}
|
||||||
name: mail-secret
|
name: pixelfed-mail
|
||||||
key: port
|
key: port
|
||||||
{{- end }}
|
{{- end }}
|
||||||
- name: MAIL_FROM_ADDRESS
|
- name: MAIL_FROM_ADDRESS
|
||||||
@@ -225,7 +225,7 @@ spec:
|
|||||||
name: {{ .Values.pixelfed.mail.existingSecret }}
|
name: {{ .Values.pixelfed.mail.existingSecret }}
|
||||||
key: {{ .Values.pixelfed.mail.existingSecretKeys.username }}
|
key: {{ .Values.pixelfed.mail.existingSecretKeys.username }}
|
||||||
{{- else }}
|
{{- else }}
|
||||||
name: mail-secret
|
name: pixelfed-mail
|
||||||
key: username
|
key: username
|
||||||
{{- end }}
|
{{- end }}
|
||||||
- name: MAIL_PASSWORD
|
- name: MAIL_PASSWORD
|
||||||
@@ -235,7 +235,7 @@ spec:
|
|||||||
name: {{ .Values.pixelfed.mail.existingSecret }}
|
name: {{ .Values.pixelfed.mail.existingSecret }}
|
||||||
key: {{ .Values.pixelfed.mail.existingSecretKeys.password }}
|
key: {{ .Values.pixelfed.mail.existingSecretKeys.password }}
|
||||||
{{- else }}
|
{{- else }}
|
||||||
name: mail-secret
|
name: pixelfed-mail
|
||||||
key: password
|
key: password
|
||||||
{{- end }}
|
{{- end }}
|
||||||
- name: MAIL_ENCRYPTION
|
- name: MAIL_ENCRYPTION
|
||||||
@@ -247,28 +247,53 @@ spec:
|
|||||||
- name: DB_HOST
|
- name: DB_HOST
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
|
{{- if .Values.externalDatabase.existingSecret }}
|
||||||
name: {{ .Values.externalDatabase.existingSecret }}
|
name: {{ .Values.externalDatabase.existingSecret }}
|
||||||
key: {{ .Values.externalDatabase.existingSecretKeys.host }}
|
key: {{ .Values.externalDatabase.existingSecretKeys.username }}
|
||||||
|
{{- else }}
|
||||||
|
name: pixelfed-database
|
||||||
|
key: host
|
||||||
|
{{- end }}
|
||||||
- name: DB_USERNAME
|
- name: DB_USERNAME
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
|
{{- if .Values.externalDatabase.existingSecret }}
|
||||||
name: {{ .Values.externalDatabase.existingSecret }}
|
name: {{ .Values.externalDatabase.existingSecret }}
|
||||||
key: {{ .Values.externalDatabase.existingSecretKeys.username }}
|
key: {{ .Values.externalDatabase.existingSecretKeys.username }}
|
||||||
|
{{- else }}
|
||||||
|
name: pixelfed-database
|
||||||
|
key: username
|
||||||
|
{{- end }}
|
||||||
- name: DB_PASSWORD
|
- name: DB_PASSWORD
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
|
{{- if .Values.externalDatabase.existingSecret }}
|
||||||
name: {{ .Values.externalDatabase.existingSecret }}
|
name: {{ .Values.externalDatabase.existingSecret }}
|
||||||
key: {{ .Values.externalDatabase.existingSecretKeys.password }}
|
key: {{ .Values.externalDatabase.existingSecretKeys.username }}
|
||||||
|
{{- else }}
|
||||||
|
name: pixelfed-database
|
||||||
|
key: password
|
||||||
|
{{- end }}
|
||||||
- name: DB_DATABASE
|
- name: DB_DATABASE
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
|
{{- if .Values.externalDatabase.existingSecret }}
|
||||||
name: {{ .Values.externalDatabase.existingSecret }}
|
name: {{ .Values.externalDatabase.existingSecret }}
|
||||||
key: {{ .Values.externalDatabase.existingSecretKeys.database }}
|
key: {{ .Values.externalDatabase.existingSecretKeys.username }}
|
||||||
|
{{- else }}
|
||||||
|
name: pixelfed-database
|
||||||
|
key: database
|
||||||
|
{{- end }}
|
||||||
- name: DB_PORT
|
- name: DB_PORT
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
|
{{- if .Values.externalDatabase.existingSecret }}
|
||||||
name: {{ .Values.externalDatabase.existingSecret }}
|
name: {{ .Values.externalDatabase.existingSecret }}
|
||||||
key: {{ .Values.externalDatabase.existingSecretKeys.port }}
|
key: {{ .Values.externalDatabase.existingSecretKeys.username }}
|
||||||
|
{{- else }}
|
||||||
|
name: pixelfed-database
|
||||||
|
key: port
|
||||||
|
{{- end }}
|
||||||
- name: DB_APPLY_NEW_MIGRATIONS_AUTOMATICALLY
|
- name: DB_APPLY_NEW_MIGRATIONS_AUTOMATICALLY
|
||||||
value: "{{ .Values.pixelfed.db_apply_new_migrations_automatically }}"
|
value: "{{ .Values.pixelfed.db_apply_new_migrations_automatically }}"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user