From 7f2bcbbf3b914ec893d74a064bed4f71b53d6d35 Mon Sep 17 00:00:00 2001
From: Rhea Danzey <rdanzey@element.io>
Date: Sun, 2 Apr 2023 16:42:20 -0500
Subject: [PATCH] chart - Add configuration for extra volumes / volume mounts

Signed-off-by: Rhea Danzey <rdanzey@element.io>
---
 helm/dendrite/Chart.yaml                |  2 +-
 helm/dendrite/templates/deployment.yaml |  6 ++++++
 helm/dendrite/values.yaml               | 15 +++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/helm/dendrite/Chart.yaml b/helm/dendrite/Chart.yaml
index 3ef45a6df..6a428e00f 100644
--- a/helm/dendrite/Chart.yaml
+++ b/helm/dendrite/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: dendrite
-version: "0.12.1"
+version: "0.12.2"
 appVersion: "0.12.0"
 description: Dendrite Matrix Homeserver
 type: application
diff --git a/helm/dendrite/templates/deployment.yaml b/helm/dendrite/templates/deployment.yaml
index 2a0f3a9e9..56d31cc22 100644
--- a/helm/dendrite/templates/deployment.yaml
+++ b/helm/dendrite/templates/deployment.yaml
@@ -40,6 +40,9 @@ spec:
       - name: {{ include "dendrite.fullname" . }}-search
         persistentVolumeClaim:
           claimName: {{ default (print ( include "dendrite.fullname" . ) "-search-pvc") $.Values.persistence.search.existingClaim | quote }}
+      {{- with .Values.extraVolumes }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
       containers:
       - name: {{ .Chart.Name }}
         {{- include "image.name" . | nindent 8 }}
@@ -73,6 +76,9 @@ spec:
           name: {{ include "dendrite.fullname" . }}-jetstream
         - mountPath: {{ .Values.dendrite_config.sync_api.search.index_path }}
           name: {{ include "dendrite.fullname" . }}-search
+        {{- with .Values.extraVolumeMounts }}
+        {{ . | toYaml | nindent 8 }}
+        {{- end }}
         livenessProbe:
           initialDelaySeconds: 10
           periodSeconds: 10
diff --git a/helm/dendrite/values.yaml b/helm/dendrite/values.yaml
index c219d27f8..e6ebf0e24 100644
--- a/helm/dendrite/values.yaml
+++ b/helm/dendrite/values.yaml
@@ -43,6 +43,21 @@ persistence:
     # -- PVC Storage Request for the search volume
     capacity: "1Gi"
 
+# Add additional volumes to the Dendrite Pod
+extraVolumes: []
+# ex.
+# - name: extra-config
+#   secret:
+#     secretName: extra-config
+
+
+# Configure additional mount points volumes in the Dendrite Pod
+extraVolumeMounts: []
+# ex.
+# - mountPath: /etc/dendrite/extra-config
+#   name: extra-config
+
+
 dendrite_config:
   version: 2
   global: