Moved volume support to common

charts/common/templates/_pvc.yaml

@@ -0,0 +1,18 @@
+{{- define "common.pvc.tpl" -}}
+{{- range .Values.volumes }}
+{{- $robustName := include "common.robustName" $.Release.Name }}
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ printf "%s-%s" $robustName .name }}
+  namespace: {{ $.Release.Namespace }}
+spec:
+  accessModes:
+    - {{ .accessMode | default "ReadWriteOnce" }}
+  storageClassName: {{ .storageClass | default "local-path" }}
+  resources:
+    requests:
+      storage: {{ .size | default "1Gi" }}
+{{- end }}
+{{- end -}}

charts/common/templates/_volumeMountsRef.yaml

@@ -0,0 +1,19 @@
+{{- define "common.volumeMountsRef.tpl" -}}
+{{- if or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets }}
+volumeMounts: &volumeMounts
+{{- range .Values.volumes }}
+  - name: {{ .name }}
+    mountPath: {{ .path }}
+{{- end }}
+{{- range .Values.sealedFileSecrets }}
+  - name: {{ .name }}
+    mountPath: {{ .path }}
+    readOnly: true
+{{- end }}
+{{- range .Values.fileSecrets }}
+  - name: {{ .name }}
+    mountPath: {{ .path }}
+    readOnly: true
+{{- end }}
+{{- end }}
+{{- end }}

charts/common/templates/_volumesRef.yaml

@@ -0,0 +1,20 @@
+{{- define "common.volumesRef.tpl" -}}
+{{- if or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets }}
+volumes:
+  {{- range .Values.volumes }}
+  - name: {{ .name }}
+    persistentVolumeClaim:
+      claimName: {{ printf "%s-%s" $.Release.Name .name }}
+  {{- end }}
+  {{- range .Values.sealedFileSecrets }}
+  - name: {{ .name }}
+    secret:
+      secretName: {{ printf "%s-%s" $.Release.Name .name }}
+  {{- end }}
+  {{- range .Values.fileSecrets }}
+  - name: {{ .name }}
+    secret:
+      secretName: {{ printf "%s-%s" $.Release.Name .name }}
+  {{- end }}
+{{- end }}
+{{- end -}}