From e2c09231d830841a9abb279e8bc1c62a53fa05ba Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 15 Nov 2021 19:30:09 +0100
Subject: [PATCH] fix(common): correctly set defaults for volumeclaimtemplates
 and pvc's (#1334)

* fix(common): correctly set defaults for volumeclaimtemplates and pvc's

* polish

* more polish

* hmmm

* whoops

* hmm

* hmm

* again....

* different

* fixes
---
 charts/library/common/Chart.yaml                 | 2 +-
 charts/library/common/templates/_statefulset.tpl | 6 +++---
 charts/library/common/templates/classes/_pvc.tpl | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index b08d9fd3a78..0ea8a3ffa2b 100644
--- a/charts/library/common/Chart.yaml
+++ b/charts/library/common/Chart.yaml
@@ -15,4 +15,4 @@ maintainers:
 name: common
 sources: null
 type: library
-version: 8.6.0
+version: 8.6.1
diff --git a/charts/library/common/templates/_statefulset.tpl b/charts/library/common/templates/_statefulset.tpl
index ab624eef79a..267ed4d0dd1 100644
--- a/charts/library/common/templates/_statefulset.tpl
+++ b/charts/library/common/templates/_statefulset.tpl
@@ -59,13 +59,13 @@ spec:
         name: {{ $vctname }}
       spec:
         accessModes:
-          - {{ required (printf "accessMode is required for vCT %v" $vct.name) $vct.accessMode  | quote }}
+          - {{ ( $vct.accessMode | default "ReadWriteOnce" ) | quote }}
         resources:
           requests:
-            storage: {{ required (printf "size is required for PVC %v" $vct.name) $vct.size | quote }}
+            storage: {{ $vct.size | default "999Gi" | quote }}
         {{- if $vct.storageClass }}
         storageClassName: {{ if (eq "-" $vct.storageClass) }}""{{- else if (eq "SCALE-ZFS" $vct.storageClass ) }}{{ ( printf "%v-%v"  "ix-storage-class" $releaseName ) }}{{- else }}{{ $vct.storageClass | quote }}{{- end }}
-        {{- else if $values.ixChartContext }}
+        {{- else if or ( $values.global.isSCALE ) ( $values.ixChartContext ) ( $values.global.ixChartContext ) }}
         storageClassName: {{ printf "%v-%v"  "ix-storage-class" $releaseName }}
         {{- end }}
     {{- end }}
diff --git a/charts/library/common/templates/classes/_pvc.tpl b/charts/library/common/templates/classes/_pvc.tpl
index 7cc28b45632..fe7b2cc7aea 100644
--- a/charts/library/common/templates/classes/_pvc.tpl
+++ b/charts/library/common/templates/classes/_pvc.tpl
@@ -45,7 +45,7 @@ spec:
       storage: {{ $values.size | default "999Gi" | quote }}
   {{- if $values.storageClass }}
   storageClassName: {{ if (eq "-" $values.storageClass) }}""{{- else if (eq "SCALE-ZFS" $values.storageClass ) }}{{ ( printf "%v-%v"  "ix-storage-class" .Release.Name ) }}{{- else }}{{ $values.storageClass | quote }}{{- end }}
-  {{- else if $.Values.global.isSCALE }}
+  {{- else if or ( $.Values.global.isSCALE ) ( $.Values.ixChartContext ) ( $.Values.global.ixChartContext ) }}
   storageClassName: {{ ( printf "%v-%v"  "ix-storage-class" .Release.Name ) }}
   {{- end }}
   {{- if $values.volumeName }}