.gitignore

@@ -1,37 +0,0 @@
-# General files for the project
-pkg/*
-*.pyc
-bin/*
-.project
-/.bin
-/_test/secrets/*.json
-
-# OSX leaves these everywhere on SMB shares
-._*
-
-# OSX trash
-.DS_Store
-
-# Files generated by JetBrains IDEs, e.g. IntelliJ IDEA
-.idea/
-*.iml
-
-# Vscode files
-.vscode
-
-# Emacs save files
-*~
-\#*\#
-.\#*
-
-# Vim-related files
-[._]*.s[a-w][a-z]
-[._]s[a-w][a-z]
-*.un~
-Session.vim
-.netrwhist
-
-# Chart dependencies
-**/charts/*.tgz
-
-.history

templates/_statefulset.tpl

@@ -51,18 +51,21 @@ spec:
           {{- end -}}
           {{- end }}
           env:
-            {{- include "lib.environmentVariables" . | default "[]" | nindent 12 }}
+            {{- include "lib.environmentVariables" . | default "{}" | nindent 12 }}
           livenessProbe:
             {{- toYaml .Values.livenessProbe | nindent 12 }}
           readinessProbe:
             {{- toYaml .Values.readinessProbe | nindent 12 }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+          {{- with .Values.volumeMounts }}
           volumeMounts:
-            {{- range $i, $values := .Values.volumeClaimTemplates }}
+            {{- toYaml . | nindent 12 }}
-            - name: {{ $values.name }}
+          {{- end }}
-              mountPath: {{ $values.mountPath }}
+      {{- with .Values.volumes }}
-            {{- end }}
+      volumes:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -75,16 +78,4 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-  volumeClaimTemplates:
+{{- end -}}
-  {{- range $i, $values := .Values.volumeClaimTemplates }}
-    - metadata:
-        name: {{ $values.name }}
-      spec:
-        accessModes:
-          -  {{ required (printf "accessMode is required for volumeClaimTemplate %v" $values.name) $values.accessMode  | quote }}
-        storageClassName: {{ required (printf "storageClassName is required for volumeClaimTemplate %v" $values.name) $values.storageClassName  | quote }}
-        resources:
-          requests:
-            storage: {{ required (printf "size is required for volumeClaimTemplate %v" $values.name) $values.size | quote }}
-  {{- end }}
-{{- end -}}

values.yaml

@@ -120,17 +120,6 @@ volumeMounts: []
 #   mountPath: "/etc/foo"
 #   readOnly: true
 
-# used for statefulset https://kubernetes.io/docs/concepts/workloads/controllers/statefulset
-volumeClaimTemplates: []
-#volumeClaimTemplates:
-#  - name: www
-#    mountPath: /var/www/html
-#    accessModes: "ReadWriteOnce"
-#    storageClassName: "my-storage-class"
-#    size: 1Gi
-
-
-
 serviceAccount:
   # Specifies whether a service account should be created
   create: true