Remove old values, update annotations

This commit is contained in:
Till Faelligen 2023-03-28 08:17:13 +02:00
parent cc0e508d5f
commit 4ba3730dbf
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
2 changed files with 3 additions and 13 deletions

View file

@ -2,14 +2,8 @@
{{- if and (not .Values.signing_key.create) (eq .Values.signing_key.existingSecret "") -}}
{{- fail "You must create a signing key for configuration.signing_key OR specify an existing secret name in .Values.signing_key.existingSecret to mount it. (see https://github.com/matrix-org/dendrite/blob/master/docs/INSTALL.md#server-key-generation)" -}}
{{- end -}}
{{- if and (eq .Values.dendrite_config.global.database.connection_string "") (not (or .Values.dendrite_config.global.database.host .Values.postgresql.enabled)) -}}
{{- fail "Database server must be set." -}}
{{- end -}}
{{- if and (eq .Values.dendrite_config.global.database.connection_string "") (not (or .Values.dendrite_config.global.database.user .Values.postgresql.enabled)) -}}
{{- fail "Database user must be set." -}}
{{- end -}}
{{- if and (eq .Values.dendrite_config.global.database.connection_string "") (not .Values.dendrite_config.global.database.password) (not .Values.postgresql.enabled) -}}
{{- fail "Database password must be set." -}}
{{- if and (not .Values.postgresql.enabled) (eq .Values.dendrite_config.global.database.connection_string "") -}}
{{- fail "Database connection string must be set." -}}
{{- end -}}
{{- end -}}

View file

@ -17,11 +17,7 @@ spec:
labels:
{{- include "dendrite.selectorLabels" . | nindent 8 }}
annotations:
confighash-global: secret-{{ .Values.global | toYaml | sha256sum | trunc 32 }}
confighash-clientapi: clientapi-{{ .Values.clientapi | toYaml | sha256sum | trunc 32 }}
confighash-federationapi: federationapi-{{ .Values.federationapi | toYaml | sha256sum | trunc 32 }}
confighash-mediaapi: mediaapi-{{ .Values.mediaapi | toYaml | sha256sum | trunc 32 }}
confighash-syncapi: syncapi-{{ .Values.syncapi | toYaml | sha256sum | trunc 32 }}
confighash: secret-{{ .Values.dendrite_config | toYaml | sha256sum | trunc 32 }}
spec:
volumes:
- name: {{ include "dendrite.fullname" . }}-conf-vol