Allow specifying extra volume mounts for containers in our Helm chart.

charts/budibase/templates/app-service-deployment.yaml

@@ -235,6 +235,10 @@ spec:
         args:
         {{- toYaml .Values.services.apps.args | nindent 10 }}
         {{ end }}
+        {{ if .Values.services.apps.extraVolumeMounts }}
+        volumeMounts:
+        {{- toYaml .Values.services.apps.extraVolumeMounts | nindent 10 }}
+        {{- end }}
       {{- if .Values.services.apps.extraContainers }}
         {{- toYaml .Values.services.apps.extraContainers | nindent 6 }}
       {{- end }}
@@ -261,4 +265,8 @@ spec:
           - name: ndots
             value: {{ .Values.services.apps.ndots | quote }}
       {{ end }}
+      {{ if .Values.services.apps.extraVolumes }}
+      volumes:
+      {{- toYaml .Values.services.apps.extraVolumes | nindent 6 }}
+      {{- end }}
 status: {}

charts/budibase/templates/automation-worker-service-deployment.yaml

@@ -235,6 +235,10 @@ spec:
         args:
         {{- toYaml .Values.services.automationWorkers.args | nindent 10 }}
         {{ end }}
+        {{ if .Values.services.automationWorkers.extraVolumeMounts }}
+        volumeMounts:
+        {{- toYaml .Values.services.automationWorkers.extraVolumeMounts | nindent 10 }}
+        {{ end }}
       {{- if .Values.services.automationWorkers.extraContainers }}
         {{- toYaml .Values.services.automationWorkers.extraContainers | nindent 6 }}
       {{- end }}
@@ -261,5 +265,9 @@ spec:
           - name: ndots
             value: {{ .Values.services.automationWorkers.ndots | quote }}
       {{ end }}
+      {{ if .Values.services.automationWorkers.extraVolumes }}
+      volumes:
+      {{- toYaml .Values.services.automationWorkers.extraVolumes | nindent 8 }}
+      {{ end }}
 status: {}
 {{- end }}

charts/budibase/templates/minio-service-deployment.yaml

@@ -54,6 +54,9 @@ spec:
         volumeMounts:
         - mountPath: /data
           name: minio-data
+        {{ if .Values.services.objectStore.extraVolumeMounts }}
+          {{- toYaml .Values.services.objectStore.extraVolumeMounts | nindent 8 }}
+        {{- end }}
       {{- if .Values.services.objectStore.extraContainers }}
         {{- toYaml .Values.services.objectStore.extraContainers | nindent 6 }}
       {{- end }}
@@ -78,5 +81,8 @@ spec:
       - name: minio-data
         persistentVolumeClaim:
           claimName: minio-data
+      {{ if .Values.services.objectStore.extraVolumes }}
+        {{- toYaml .Values.services.objectStore.extraVolumes | nindent 6 }}
+      {{- end }}
 status: {}
 {{- end }}

charts/budibase/templates/proxy-service-deployment.yaml

@@ -82,6 +82,10 @@ spec:
         resources:
         {{- toYaml . | nindent 10 }}
         {{ end }}
+        {{ if .Values.services.proxy.extraVolumeMounts }}
+        volumeMounts:
+        {{- toYaml .Values.services.proxy.extraVolumeMounts | nindent 8 }}
+        {{- end }}
       {{- if .Values.services.proxy.extraContainers }}
         {{- toYaml .Values.services.proxy.extraContainers | nindent 6 }}
       {{- end }}
@@ -110,7 +114,10 @@ spec:
       args:
       {{- toYaml .Values.services.proxy.args | nindent 8 }}
       {{ end }}
+      {{ if .Values.services.proxy.extraVolumes }}
       volumes:
+      {{- toYaml .Values.services.proxy.extraVolumes | nindent 6 }}
+      {{ end }}
       {{ if .Values.services.proxy.ndots }}
       dnsConfig:
         options:

charts/budibase/templates/redis-service-deployment.yaml

@@ -22,7 +22,7 @@ spec:
         - redis-server 
         - --requirepass 
         - {{ .Values.services.redis.password }}
-        image: redis
+        image: {{ .Values.services.redis.image }}
         imagePullPolicy: ""
         name: redis-service
         ports:
@@ -34,6 +34,9 @@ spec:
         volumeMounts:
         - mountPath: /data
           name: redis-data
+        {{ if .Values.services.redis.extraVolumeMounts }}
+          {{- toYaml .Values.services.redis.extraVolumeMounts | nindent 8 }}
+        {{- end }}
     {{- if .Values.services.redis.extraContainers }}
       {{- toYaml .Values.services.redis.extraContainers | nindent 6 }}
     {{- end }}
@@ -58,6 +61,9 @@ spec:
       - name: redis-data
         persistentVolumeClaim:
           claimName: redis-data
+      {{ if .Values.services.redis.extraVolumes }}
+        {{- toYaml .Values.services.redis.extraVolumes | nindent 6 }}
+      {{- end }}
 
 status: {}
 {{- end }}

charts/budibase/templates/worker-service-deployment.yaml

@@ -221,6 +221,10 @@ spec:
         args:
         {{- toYaml .Values.services.worker.args | nindent 10 }}
         {{ end }}
+        {{ if .Values.services.worker.extraVolumeMounts }}
+        volumeMounts:
+        {{- toYaml .Values.services.worker.extraVolumeMounts | nindent 10 }}
+        {{- end }}
       {{- if .Values.services.worker.extraContainers }}
         {{- toYaml .Values.services.worker.extraContainers | nindent 6 }}
       {{- end }}
@@ -247,4 +251,8 @@ spec:
           - name: ndots
             value: {{ .Values.services.worker.ndots | quote }}
       {{ end }}
+      {{ if .Values.services.worker.extraVolumes }}
+      volumes:
+      {{- toYaml .Values.services.worker.extraVolumes | nindent 6 }}
+      {{- end }}
 status: {}

charts/budibase/values.yaml

@@ -211,6 +211,16 @@ services:
     #  - name: my-sidecar
     #    image: myimage:latest
 
+    # -- Additional volumeMounts to the main proxy container.
+    extraVolumeMounts: []
+    #  - name: my-volume
+    #   mountPath: /path/to/mount
+
+    # -- Additional volumes to the proxy pod.
+    extraVolumes: []
+    #  - name: my-volume
+    #    emptyDir: {}
+
   apps:
     # @ignore (you shouldn't need to change this)
     port: 4002
@@ -283,6 +293,16 @@ services:
     #  - name: my-sidecar
     #    image: myimage:latest
 
+    # -- Additional volumeMounts to the main apps container.
+    extraVolumeMounts: []
+    #  - name: my-volume
+    #   mountPath: /path/to/mount
+
+    # -- Additional volumes to the apps pod.
+    extraVolumes: []
+    #  - name: my-volume
+    #    emptyDir: {}
+
   automationWorkers:
     # -- Whether or not to enable the automation worker service. If you disable this,
     # automations will be processed by the apps service.
@@ -359,6 +379,16 @@ services:
     #  - name: my-sidecar
     #    image: myimage:latest
 
+    # -- Additional volumeMounts to the main automationWorkers container.
+    extraVolumeMounts: []
+    #  - name: my-volume
+    #   mountPath: /path/to/mount
+
+    # -- Additional volumes to the automationWorkers pod.
+    extraVolumes: []
+    #  - name: my-volume
+    #    emptyDir: {}
+
   worker:
     # @ignore (you shouldn't need to change this)
     port: 4003
@@ -431,6 +461,16 @@ services:
     #  - name: my-sidecar
     #    image: myimage:latest
 
+    # -- Additional volumeMounts to the main worker container.
+    extraVolumeMounts: []
+    #  - name: my-volume
+    #   mountPath: /path/to/mount
+
+    # -- Additional volumes to the worker pod.
+    extraVolumes: []
+    #  - name: my-volume
+    #    emptyDir: {}
+
   couchdb:
     # -- Whether or not to spin up a CouchDB instance in your cluster. True by
     # default, and the configuration for the CouchDB instance is under the
@@ -456,6 +496,8 @@ services:
       resources: {}
 
   redis:
+    # -- The Redis image to use.
+    image: redis
     # -- Whether or not to deploy a Redis pod into your cluster.
     enabled: true
     # -- Port to expose Redis on.
@@ -484,6 +526,16 @@ services:
     #  - name: my-sidecar
     #    image: myimage:latest
 
+    # -- Additional volumeMounts to the main redis container.
+    extraVolumeMounts: []
+    #  - name: my-volume
+    #   mountPath: /path/to/mount
+
+    # -- Additional volumes to the redis pod.
+    extraVolumes: []
+    #  - name: my-volume
+    #    emptyDir: {}
+
   objectStore:
     # -- Set to false if using another object store, such as S3. You will need
     # to set `services.objectStore.url` to point to your bucket if you do this.
@@ -530,6 +582,16 @@ services:
     #  - name: my-sidecar
     #    image: myimage:latest
 
+    # -- Additional volumeMounts to the main objectStore container.
+    extraVolumeMounts: []
+    #  - name: my-volume
+    #   mountPath: /path/to/mount
+
+    # -- Additional volumes to the objectStore pod.
+    extraVolumes: []
+    #  - name: my-volume
+    #    emptyDir: {}
+
 # Override values in couchDB subchart. We're only specifying the values we're changing.
 # If you want to see all of the available values, see:
 #   https://github.com/apache/couchdb-helm/tree/couchdb-4.3.0/couchdb