Add extraVolumes and extraVolumeMounts (#164)

charts/vaultwarden/Chart.yaml

@@ -13,5 +13,5 @@ maintainers:
   - name: guerzon
     email: guerzon@proton.me
     url: https://github.com/guerzon
-version: 0.33.0
+version: 0.34.0
 kubeVersion: ">=1.12.0-0"

charts/vaultwarden/templates/_podSpec.tpl

@@ -151,9 +151,12 @@ containers:
       - containerPort: 8080
         name: http
         protocol: TCP
+    volumeMounts:
+    {{- with .Values.extraVolumeMounts }}
+    {{- toYaml . | nindent 6 }}
+    {{- end }}
     {{- if .Values.storage.existingVolumeClaim }}
     {{- with .Values.storage.existingVolumeClaim }}
-    volumeMounts:
       - name: vaultwarden-data
         mountPath: {{ default "/data" .dataPath }}
       - name: vaultwarden-data
@@ -161,7 +164,6 @@ containers:
     {{- end }}
     {{- else }}
     {{- if or (.Values.storage.data) (.Values.storage.attachments) }}
-    volumeMounts:
       {{- with .Values.storage.data }}
       - name: {{ .name }}
         mountPath: {{ default "/data" .path }}
@@ -214,9 +216,12 @@ containers:
     {{- with .Values.sidecars }}
     {{- toYaml . | nindent 2 }}
     {{- end }}
+volumes:
+{{- with .Values.extraVolumes }}
+{{- toYaml . | nindent 2 }}
+{{- end }}
 {{- if .Values.storage.existingVolumeClaim }}
 {{- with .Values.storage.existingVolumeClaim }}
-volumes:
   - name: vaultwarden-data
     persistentVolumeClaim:
       claimName: {{ .claimName }}
@@ -229,4 +234,4 @@ serviceAccountName: {{ .Values.serviceAccount.name }}
 imagePullSecrets:
   {{- toYaml . | nindent 2 }}
 {{- end }}
-{{- end }}
+{{- end }}

charts/vaultwarden/values.yaml

@@ -89,6 +89,14 @@ initContainers: []
 ##
 sidecars: []
 
+## @param extraVolumes Optionally specify extra list of additional volumes
+##
+extraVolumes: []
+
+## @param extraVolumeMounts Optionally specify extra list of additional volumeMounts
+##
+extraVolumeMounts: []
+
 ## @param nodeSelector Node labels for pod assignment
 ## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector
 ##