From 69f1ad7ce55b1bfab9f737d1fd9083ee88d571b3 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 6 Jul 2021 13:53:15 +0200
Subject: [PATCH] Allow dict being used for statefull set persistence settings
 (#669)

* Allow dict being used for statefull set persistence settings

* bump common version
---
 charts/library/common/Chart.yaml                 | 2 +-
 charts/library/common/templates/_statefulset.tpl | 6 +++++-
 charts/library/common/values.yaml                | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index 439234a8374..37c9c1df29b 100644
--- a/charts/library/common/Chart.yaml
+++ b/charts/library/common/Chart.yaml
@@ -18,4 +18,4 @@ maintainers:
 name: common
 sources:
 type: library
-version: 6.5.4
+version: 6.6.0
diff --git a/charts/library/common/templates/_statefulset.tpl b/charts/library/common/templates/_statefulset.tpl
index 2384ca96dcd..2d69f68f3ef 100644
--- a/charts/library/common/templates/_statefulset.tpl
+++ b/charts/library/common/templates/_statefulset.tpl
@@ -49,8 +49,12 @@ spec:
       {{- include "common.controller.pod" . | nindent 6 }}
   volumeClaimTemplates:
     {{- range $index, $vct := .Values.volumeClaimTemplates }}
+    {{- $vctname := $index }}
+    {{- if $vct.name }}
+    {{- $vctname := $vct.name }}
+    {{- end }}
     - metadata:
-        name: {{ $vct.name }}
+        name: {{ $vctname }}
       spec:
         accessModes:
           - {{ required (printf "accessMode is required for vCT %v" $vct.name) $vct.accessMode  | quote }}
diff --git a/charts/library/common/values.yaml b/charts/library/common/values.yaml
index a438396847e..fe13cf2c5c3 100644
--- a/charts/library/common/values.yaml
+++ b/charts/library/common/values.yaml
@@ -442,10 +442,12 @@ persistence:
 
 # -- Used in conjunction with `controller.type: statefulset` to create individual disks for each instance.
 volumeClaimTemplates: []
-# - name: data
+# data:
 #   mountPath: /data
 #   accessMode: "ReadWriteOnce"
 #   size: 1Gi
+
+## Or use a list
 # - name: backup
 #   mountPath: /backup
 #   subPath: theSubPath