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 -}}

charts/cron-job/templates/cronJob.yaml

@@ -38,19 +38,10 @@ spec:
                 - secretRef:
                     name: {{ .Release.Name }}
                 {{- end }}
-              volumeMounts:
+              {{- include "common.volumeMountsRef.tpl" . | nindent 14 }}
-                {{- range .Values.volumes }}
-                - name: {{ .name }}
-                  mountPath: {{ .path }}
-                {{- end }}
               resources:
                 {{- toYaml .Values.resources | nindent 16 }}
-          volumes:
+          {{- include "common.volumesRef.tpl" . | nindent 10 }}
-            {{- range .Values.volumes }}
-            - name: {{ .name }}
-              persistentVolumeClaim:
-                claimName: {{ printf "%s-%s" $.Release.Name .name }}
-            {{- end }}
           {{ with .Values.nodeSelector }}
           nodeSelector:
             {{ toYaml . | nindent 8 }}

charts/cron-job/templates/pvc.yaml

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

charts/onechart/templates/deployment.yaml

@@ -102,23 +102,7 @@ spec:
             {{- toYaml . | nindent 12 }}
             {{- end }}
           {{- end }}
-          {{- if or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets }}
+          {{- include "common.volumeMountsRef.tpl" . | nindent 10 }}
-          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 }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
         {{- if .Values.sidecar }}
@@ -138,24 +122,7 @@ spec:
           volumeMounts: *volumeMounts
           {{- end }}
         {{- end }}
-      {{- if or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets }}
+      {{- include "common.volumesRef.tpl" . | nindent 6 }}
-      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 }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/onechart/templates/pvc.yaml

@@ -1,16 +1 @@
-{{- range .Values.volumes }}
+{{- include "common.pvc.tpl" . -}}
-{{- $robustName := include "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 }}

values-cron-job.yaml

@@ -9,3 +9,9 @@ shell: "/bin/sh"
 
 vars:
   MY_VAR: "value"
+
+volumes:
+  - name: data
+    path: /data
+    size: 10Gi
+    storageClass: default

values.yaml

@@ -15,3 +15,9 @@ gitSha: xyz
 
 vars:
   MY_VAR: "value"
+
+volumes:
+  - name: data
+    path: /data
+    size: 10Gi
+    storageClass: default