diff --git a/charts/matrix-synapse/Chart.yaml b/charts/matrix-synapse/Chart.yaml index d2aa0a3..a4b97f1 100644 --- a/charts/matrix-synapse/Chart.yaml +++ b/charts/matrix-synapse/Chart.yaml @@ -6,7 +6,7 @@ icon: https://matrix.org/images/matrix-logo.svg appVersion: 1.79.0 type: application -version: 3.2.1 +version: 3.2.2 maintainers: - name: Alexander Olofsson email: ace@haxalot.com diff --git a/charts/matrix-synapse/templates/configuration-scripts.yaml b/charts/matrix-synapse/templates/configuration-scripts.yaml index cefd9fc..11d087b 100644 --- a/charts/matrix-synapse/templates/configuration-scripts.yaml +++ b/charts/matrix-synapse/templates/configuration-scripts.yaml @@ -1,3 +1,4 @@ +{{- if .Values.signingkey.job.enabled }} --- apiVersion: v1 kind: ConfigMap @@ -7,6 +8,7 @@ metadata: {{- include "matrix-synapse.labels" . | nindent 4 }} annotations: helm.sh/hook: pre-install - helm.sh/resource-policy: keep + helm.sh/hook-delete-policy: hook-succeeded data: {{ (.Files.Glob "scripts/*.sh").AsConfig | indent 2 }} +{{- end }} diff --git a/charts/matrix-synapse/templates/deployment.yaml b/charts/matrix-synapse/templates/deployment.yaml index ba46158..214aa2c 100644 --- a/charts/matrix-synapse/templates/deployment.yaml +++ b/charts/matrix-synapse/templates/deployment.yaml @@ -133,8 +133,6 @@ spec: volumeMounts: - name: config mountPath: /synapse/config - - name: scripts - mountPath: /opt/k8s-synapse - name: tmpconf mountPath: /synapse/config/conf.d - name: secrets @@ -154,10 +152,6 @@ spec: - name: config configMap: name: {{ include "matrix-synapse.fullname" . }} - - name: scripts - configMap: - name: {{ include "matrix-synapse.fullname" . }}-scripts - defaultMode: 0755 - name: secrets secret: secretName: {{ include "matrix-synapse.fullname" . }}