[stable/opencart] Fix 'storageClass' macros (#16548)

* Fix 'storageClass' macros

Signed-off-by: Alejandro Moreno <amoreno@bitnami.com>

* Update MariaDB dependency

Signed-off-by: juan131 <juan@bitnami.com>

stable/opencart/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: opencart
-version: 6.1.1
+version: 6.1.2
 appVersion: 3.0.3-2
 description: A free and open source e-commerce platform for online merchants. It provides a professional and reliable foundation for a successful online store.
 keywords:

stable/opencart/requirements.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: mariadb
   repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 6.7.4
+  version: 6.8.2
 digest: sha256:a363428d6463718a9523a88c70e485218373e315f2979cb1bb17b034ec2be96a
-generated: 2019-08-11T08:08:33.050428891Z
+generated: "2019-08-22T17:55:46.001736+02:00"

stable/opencart/templates/_helpers.tpl

@@ -151,25 +151,25 @@ but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else
 {{- if .Values.global -}}
     {{- if .Values.global.storageClass -}}
         {{- if (eq "-" .Values.global.storageClass) -}}
-            {{- printf "\"\"" -}}
+            {{- printf "storageClassName: \"\"" -}}
         {{- else }}
-            {{- printf "%s" .Values.global.storageClass -}}
+            {{- printf "storageClassName: %s" .Values.global.storageClass -}}
         {{- end -}}
     {{- else -}}
         {{- if .Values.persistence.opencart.storageClass -}}
               {{- if (eq "-" .Values.persistence.opencart.storageClass) -}}
-                  {{- printf "\"\"" -}}
+                  {{- printf "storageClassName: \"\"" -}}
               {{- else }}
-                  {{- printf "%s" .Values.persistence.opencart.storageClass -}}
+                  {{- printf "storageClassName: %s" .Values.persistence.opencart.storageClass -}}
               {{- end -}}
         {{- end -}}
     {{- end -}}
 {{- else -}}
     {{- if .Values.persistence.opencart.storageClass -}}
         {{- if (eq "-" .Values.persistence.opencart.storageClass) -}}
-            {{- printf "\"\"" -}}
+            {{- printf "storageClassName: \"\"" -}}
         {{- else }}
-            {{- printf "%s" .Values.persistence.opencart.storageClass -}}
+            {{- printf "storageClassName: %s" .Values.persistence.opencart.storageClass -}}
         {{- end -}}
     {{- end -}}
 {{- end -}}

stable/opencart/templates/opencart-pvc.yaml

@@ -14,5 +14,5 @@ spec:
   resources:
     requests:
       storage: {{ .Values.persistence.opencart.size | quote }}
-  storageClassName: {{ include "opencart.storageClass" . }}
+  {{ include "opencart.storageClass" . }}
 {{- end -}}