Merge pull request #1372 from juan131/fix-storageclass

[bitnami/*] Fix 'storageClass' macros
2026-03-05 06:47:25 +08:00 · 2019-08-22 13:32:29 +02:00
parent 18979435f8 270007568e
commit fd3e9ca31f
62 changed files with 225 additions and 196 deletions
--- a/bitnami/cassandra/Chart.yaml
+++ b/bitnami/cassandra/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: cassandra
-version: 3.3.1
+version: 3.3.2
 appVersion: 3.11.4
 description: Apache Cassandra is a free and open-source distributed database management system designed to handle large amounts of data across many commodity servers, providing high availability with no single point of failure. Cassandra offers robust support for clusters spanning multiple datacenters, with asynchronous masterless replication allowing low latency operations for all clients.
 icon: https://bitnami.com/assets/stacks/cassandra/img/cassandra-stack-220x234.png
--- a/bitnami/cassandra/templates/_helpers.tpl
+++ b/bitnami/cassandra/templates/_helpers.tpl
@@ -175,7 +175,7 @@ Also, we can't use a single if because lazy evaluation is not an option
 {{- end -}}

 {{/*
-Return  the proper Storage Class
+Return the proper Storage Class
 */}}
 {{- define "cassandra.storageClass" -}}
 {{/*
@@ -185,25 +185,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.storageClass -}}
              {{- if (eq "-" .Values.persistence.storageClass) -}}
-                  {{- printf "\"\"" -}}
+                  {{- printf "storageClassName: \"\"" -}}
              {{- else }}
-                  {{- printf "%s" .Values.persistence.storageClass -}}
+                  {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
              {{- end -}}
        {{- end -}}
    {{- end -}}
 {{- else -}}
    {{- if .Values.persistence.storageClass -}}
        {{- if (eq "-" .Values.persistence.storageClass) -}}
-            {{- printf "\"\"" -}}
+            {{- printf "storageClassName: \"\"" -}}
        {{- else }}
-            {{- printf "%s" .Values.persistence.storageClass -}}
+            {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
        {{- end -}}
    {{- end -}}
 {{- end -}}
--- a/bitnami/cassandra/templates/statefulset.yaml
+++ b/bitnami/cassandra/templates/statefulset.yaml
@@ -267,5 +267,5 @@ spec:
      resources:
        requests:
          storage: {{ .Values.persistence.size | quote }}
-      storageClassName: {{ include "cassandra.storageClass" . }}
+      {{ include "cassandra.storageClass" . }}
 {{- end }}
--- a/bitnami/consul/Chart.yaml
+++ b/bitnami/consul/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: consul
-version: 5.3.1
+version: 5.3.2
 appVersion: 1.5.3
 description: Highly available and distributed service discovery and key-value store designed with support for the modern data center to make distributed systems and configuration easy.
 home: https://www.consul.io/
--- a/bitnami/consul/templates/_helpers.tpl
+++ b/bitnami/consul/templates/_helpers.tpl
@@ -141,7 +141,7 @@ Also, we can't use a single if because lazy evaluation is not an option
 {{- end -}}

 {{/*
-Return  the proper Storage Class
+Return the proper Storage Class
 */}}
 {{- define "consul.storageClass" -}}
 {{/*
@@ -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.storageClass -}}
              {{- if (eq "-" .Values.persistence.storageClass) -}}
-                  {{- printf "\"\"" -}}
+                  {{- printf "storageClassName: \"\"" -}}
              {{- else }}
-                  {{- printf "%s" .Values.persistence.storageClass -}}
+                  {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
              {{- end -}}
        {{- end -}}
    {{- end -}}
 {{- else -}}
    {{- if .Values.persistence.storageClass -}}
        {{- if (eq "-" .Values.persistence.storageClass) -}}
-            {{- printf "\"\"" -}}
+            {{- printf "storageClassName: \"\"" -}}
        {{- else }}
-            {{- printf "%s" .Values.persistence.storageClass -}}
+            {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
        {{- end -}}
    {{- end -}}
 {{- end -}}
--- a/bitnami/consul/templates/statefulset.yaml
+++ b/bitnami/consul/templates/statefulset.yaml
@@ -258,7 +258,7 @@ spec:
        resources:
          requests:
            storage: {{ .Values.persistence.size | quote }}
-        storageClassName: {{ include "consul.storageClass" . }}
+        {{ include "consul.storageClass" . }}
 {{- else }}
        - name: data
          emptyDir: {}
--- a/bitnami/elasticsearch/Chart.yaml
+++ b/bitnami/elasticsearch/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: elasticsearch
-version: 6.2.1
+version: 6.2.2
 appVersion: 7.3.0
 description: A highly scalable open-source full-text search and analytics engine
 keywords:
--- a/bitnami/elasticsearch/templates/_helpers.tpl
+++ b/bitnami/elasticsearch/templates/_helpers.tpl
@@ -224,7 +224,7 @@ Also, we can't use a single if because lazy evaluation is not an option
 {{- end -}}

 {{/*
-Return  the proper Storage Class
+Return the proper Storage Class
 */}}
 {{- define "elasticsearch.data.storageClass" -}}
 {{/*
@@ -234,25 +234,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.data.persistence.storageClass -}}
              {{- if (eq "-" .Values.data.persistence.storageClass) -}}
-                  {{- printf "\"\"" -}}
+                  {{- printf "storageClassName: \"\"" -}}
              {{- else }}
-                  {{- printf "%s" .Values.data.persistence.storageClass -}}
+                  {{- printf "storageClassName: %s" .Values.data.persistence.storageClass -}}
              {{- end -}}
        {{- end -}}
    {{- end -}}
 {{- else -}}
    {{- if .Values.data.persistence.storageClass -}}
        {{- if (eq "-" .Values.data.persistence.storageClass) -}}
-            {{- printf "\"\"" -}}
+            {{- printf "storageClassName: \"\"" -}}
        {{- else }}
-            {{- printf "%s" .Values.data.persistence.storageClass -}}
+            {{- printf "storageClassName: %s" .Values.data.persistence.storageClass -}}
        {{- end -}}
    {{- end -}}
 {{- end -}}
--- a/bitnami/elasticsearch/templates/data-statefulset.yaml
+++ b/bitnami/elasticsearch/templates/data-statefulset.yaml
@@ -163,7 +163,7 @@ spec:
    spec:
      accessModes:
 {{ toYaml .Values.data.persistence.accessModes | indent 8 }}
-      storageClassName: {{ include "elasticsearch.data.storageClass" . }}
+      {{ include "elasticsearch.data.storageClass" . }}
      resources:
        requests:
          storage: {{ .Values.data.persistence.size | quote }}
--- a/bitnami/etcd/Chart.yaml
+++ b/bitnami/etcd/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: etcd
-version: 4.3.2
+version: 4.3.3
 appVersion: 3.3.15
 description: etcd is a distributed key value store that provides a reliable way to store data across a cluster of machines
 keywords:
--- a/bitnami/etcd/templates/_helpers.tpl
+++ b/bitnami/etcd/templates/_helpers.tpl
@@ -243,7 +243,7 @@ Also, we can't use a single if because lazy evaluation is not an option
 {{- end -}}

 {{/*
-Return  the proper Storage Class
+Return the proper Storage Class
 */}}
 {{- define "etcd.storageClass" -}}
 {{/*
@@ -253,25 +253,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.storageClass -}}
              {{- if (eq "-" .Values.persistence.storageClass) -}}
-                  {{- printf "\"\"" -}}
+                  {{- printf "storageClassName: \"\"" -}}
              {{- else }}
-                  {{- printf "%s" .Values.persistence.storageClass -}}
+                  {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
              {{- end -}}
        {{- end -}}
    {{- end -}}
 {{- else -}}
    {{- if .Values.persistence.storageClass -}}
        {{- if (eq "-" .Values.persistence.storageClass) -}}
-            {{- printf "\"\"" -}}
+            {{- printf "storageClassName: \"\"" -}}
        {{- else }}
-            {{- printf "%s" .Values.persistence.storageClass -}}
+            {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
        {{- end -}}
    {{- end -}}
 {{- end -}}
--- a/bitnami/etcd/templates/statefulset.yaml
+++ b/bitnami/etcd/templates/statefulset.yaml
@@ -323,7 +323,7 @@ spec:
        resources:
          requests:
            storage: {{ .Values.persistence.size | quote }}
-        storageClassName: {{ include "etcd.storageClass" . }}
+        {{ include "etcd.storageClass" . }}
 {{- else }}
      - name: data
        emptyDir: {}
--- a/bitnami/harbor/Chart.yaml
+++ b/bitnami/harbor/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: harbor
-version: 2.5.1
+version: 2.5.2
 appVersion: 1.8.1
 description: Harbor is an an open source trusted cloud native registry project that stores, signs, and scans content
 keywords:
--- a/bitnami/harbor/templates/_helpers.tpl
+++ b/bitnami/harbor/templates/_helpers.tpl
@@ -698,7 +698,7 @@ Also, we can't use a single if because lazy evaluation is not an option
 {{- end -}}

 {{/*
-Return  the proper Storage Class for chartmuseum
+Return the proper Storage Class for chartmuseum
 */}}
 {{- define "harbor.chartmuseum.storageClass" -}}
 {{- $chartmuseum := .Values.persistence.persistentVolumeClaim.chartmuseum -}}
@@ -709,32 +709,32 @@ 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 $chartmuseum.storageClass -}}
              {{- if (eq "-" $chartmuseum.storageClass) -}}
-                  {{- printf "\"\"" -}}
+                  {{- printf "storageClassName: \"\"" -}}
              {{- else }}
-                  {{- printf "%s" $chartmuseum.storageClass -}}
+                  {{- printf "storageClassName: %s" $chartmuseum.storageClass -}}
              {{- end -}}
        {{- end -}}
    {{- end -}}
 {{- else -}}
    {{- if $chartmuseum.storageClass -}}
        {{- if (eq "-" $chartmuseum.storageClass) -}}
-            {{- printf "\"\"" -}}
+            {{- printf "storageClassName: \"\"" -}}
        {{- else }}
-            {{- printf "%s" $chartmuseum.storageClass -}}
+            {{- printf "storageClassName: %s" $chartmuseum.storageClass -}}
        {{- end -}}
    {{- end -}}
 {{- end -}}
 {{- end -}}

 {{/*
-Return  the proper Storage Class for jobservice
+Return the proper Storage Class for jobservice
 */}}
 {{- define "harbor.jobservice.storageClass" -}}
 {{- $jobservice := .Values.persistence.persistentVolumeClaim.jobservice -}}
@@ -745,32 +745,32 @@ 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 $jobservice.storageClass -}}
              {{- if (eq "-" $jobservice.storageClass) -}}
-                  {{- printf "\"\"" -}}
+                  {{- printf "storageClassName: \"\"" -}}
              {{- else }}
-                  {{- printf "%s" $jobservice.storageClass -}}
+                  {{- printf "storageClassName: %s" $jobservice.storageClass -}}
              {{- end -}}
        {{- end -}}
    {{- end -}}
 {{- else -}}
    {{- if $jobservice.storageClass -}}
        {{- if (eq "-" $jobservice.storageClass) -}}
-            {{- printf "\"\"" -}}
+            {{- printf "storageClassName: \"\"" -}}
        {{- else }}
-            {{- printf "%s" $jobservice.storageClass -}}
+            {{- printf "storageClassName: %s" $jobservice.storageClass -}}
        {{- end -}}
    {{- end -}}
 {{- end -}}
 {{- end -}}

 {{/*
-Return  the proper Storage Class for registry
+Return the proper Storage Class for registry
 */}}
 {{- define "harbor.registry.storageClass" -}}
 {{- $registry := .Values.persistence.persistentVolumeClaim.registry -}}
@@ -781,25 +781,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 $registry.storageClass -}}
              {{- if (eq "-" $registry.storageClass) -}}
-                  {{- printf "\"\"" -}}
+                  {{- printf "storageClassName: \"\"" -}}
              {{- else }}
-                  {{- printf "%s" $registry.storageClass -}}
+                  {{- printf "storageClassName: %s" $registry.storageClass -}}
              {{- end -}}
        {{- end -}}
    {{- end -}}
 {{- else -}}
    {{- if $registry.storageClass -}}
        {{- if (eq "-" $registry.storageClass) -}}
-            {{- printf "\"\"" -}}
+            {{- printf "storageClassName: \"\"" -}}
        {{- else }}
-            {{- printf "%s" $registry.storageClass -}}
+            {{- printf "storageClassName: %s" $registry.storageClass -}}
        {{- end -}}
    {{- end -}}
 {{- end -}}
--- a/bitnami/harbor/templates/chartmuseum/chartmuseum-pvc.yaml
+++ b/bitnami/harbor/templates/chartmuseum/chartmuseum-pvc.yaml
@@ -19,7 +19,7 @@ spec:
  resources:
    requests:
      storage: {{ $chartmuseum.size }}
-  storageClassName: {{ include "harbor.chartmuseum.storageClass" . }}
+  {{ include "harbor.chartmuseum.storageClass" . }}
 {{- end }}
 {{- end }}
 {{- end }}
--- a/bitnami/harbor/templates/jobservice/jobservice-pvc.yaml
+++ b/bitnami/harbor/templates/jobservice/jobservice-pvc.yaml
@@ -18,6 +18,6 @@ spec:
  resources:
    requests:
      storage: {{ $jobservice.size }}
-  storageClassName: {{ include "harbor.jobservice.storageClass" . }}
+  {{ include "harbor.jobservice.storageClass" . }}
 {{- end }}
 {{- end }}
--- a/bitnami/harbor/templates/registry/registry-pvc.yaml
+++ b/bitnami/harbor/templates/registry/registry-pvc.yaml
@@ -18,6 +18,6 @@ spec:
  resources:
    requests:
      storage: {{ $registry.size }}
-  storageClassName: {{ include "harbor.registry.storageClass" . }}
+  {{ include "harbor.registry.storageClass" . }}
 {{- end }}
 {{- end }}
--- a/bitnami/jenkins/Chart.yaml
+++ b/bitnami/jenkins/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: jenkins
-version: 3.3.1
+version: 3.3.2
 appVersion: 2.176.2
 description: The leading open source automation server
 keywords:
--- a/bitnami/jenkins/templates/_helpers.tpl
+++ b/bitnami/jenkins/templates/_helpers.tpl
@@ -112,7 +112,7 @@ imagePullSecrets:
 {{- end -}}

 {{/*
-Return  the proper Storage Class
+Return the proper Storage Class
 */}}
 {{- define "jenkins.storageClass" -}}
 {{/*
@@ -122,25 +122,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.storageClass -}}
              {{- if (eq "-" .Values.persistence.storageClass) -}}
-                  {{- printf "\"\"" -}}
+                  {{- printf "storageClassName: \"\"" -}}
              {{- else }}
-                  {{- printf "%s" .Values.persistence.storageClass -}}
+                  {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
              {{- end -}}
        {{- end -}}
    {{- end -}}
 {{- else -}}
    {{- if .Values.persistence.storageClass -}}
        {{- if (eq "-" .Values.persistence.storageClass) -}}
-            {{- printf "\"\"" -}}
+            {{- printf "storageClassName: \"\"" -}}
        {{- else }}
-            {{- printf "%s" .Values.persistence.storageClass -}}
+            {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
        {{- end -}}
    {{- end -}}
 {{- end -}}
--- a/bitnami/jenkins/templates/pvc.yaml
+++ b/bitnami/jenkins/templates/pvc.yaml
@@ -9,12 +9,12 @@ metadata:
    release: "{{ .Release.Name }}"
    heritage: "{{ .Release.Service }}"
  annotations:
-    volume.alpha.kubernetes.io/storage-class: {{ ternary "default" (include "jenkins.storageClass" .) (empty (include "jenkins.storageClass" .)) }}
+    volume.alpha.kubernetes.io/storage-class: {{ ternary "default" (trimPrefix "storageClassName: " (include "jenkins.storageClass" .)) (empty (include "jenkins.storageClass" .)) }}
 spec:
  accessModes:
    - {{ .Values.persistence.accessMode | quote }}
  resources:
    requests:
      storage: {{ .Values.persistence.size | quote }}
-  storageClassName: {{ include "jenkins.storageClass" . }}
+  {{ include "jenkins.storageClass" . }}
 {{- end -}}
--- a/bitnami/jenkins/values.yaml
+++ b/bitnami/jenkins/values.yaml
@@ -14,7 +14,7 @@
 image:
  registry: docker.io
  repository: bitnami/jenkins
-  tag: 2.176.2-debian-9-r0
+  tag: 2.176.2-debian-9-r35
  ## Specify a imagePullPolicy
  ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
  ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -183,7 +183,7 @@ metrics:
  image:
    registry: docker.io
    repository: bitnami/jenkins-exporter
-    tag: 0.20171225.0-debian-9-r3
+    tag: 0.20171225.0-debian-9-r13
    pullPolicy: IfNotPresent
    ## Optionally specify an array of imagePullSecrets.
    ## Secrets must be manually created in the namespace.
--- a/bitnami/kafka/Chart.yaml
+++ b/bitnami/kafka/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: kafka
-version: 5.2.1
+version: 5.2.2
 appVersion: 2.3.0
 description: Apache Kafka is a distributed streaming platform.
 keywords:
--- a/bitnami/kafka/templates/_helpers.tpl
+++ b/bitnami/kafka/templates/_helpers.tpl
@@ -184,7 +184,7 @@ Also, we can't use a single if because lazy evaluation is not an option
 {{- end -}}

 {{/*
-Return  the proper Storage Class
+Return the proper Storage Class
 */}}
 {{- define "kafka.storageClass" -}}
 {{/*
@@ -194,25 +194,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.storageClass -}}
              {{- if (eq "-" .Values.persistence.storageClass) -}}
-                  {{- printf "\"\"" -}}
+                  {{- printf "storageClassName: \"\"" -}}
              {{- else }}
-                  {{- printf "%s" .Values.persistence.storageClass -}}
+                  {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
              {{- end -}}
        {{- end -}}
    {{- end -}}
 {{- else -}}
    {{- if .Values.persistence.storageClass -}}
        {{- if (eq "-" .Values.persistence.storageClass) -}}
-            {{- printf "\"\"" -}}
+            {{- printf "storageClassName: \"\"" -}}
        {{- else }}
-            {{- printf "%s" .Values.persistence.storageClass -}}
+            {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
        {{- end -}}
    {{- end -}}
 {{- end -}}
--- a/bitnami/kafka/templates/statefulset.yaml
+++ b/bitnami/kafka/templates/statefulset.yaml
@@ -332,5 +332,5 @@ spec:
        resources:
          requests:
            storage: {{ .Values.persistence.size | quote }}
-        storageClassName: {{ include "kafka.storageClass" . }}
+        {{ include "kafka.storageClass" . }}
 {{- end }}
--- a/bitnami/magento/Chart.yaml
+++ b/bitnami/magento/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: magento
-version: 8.1.1
+version: 8.2.0
 appVersion: 2.3.2
 description: A feature-rich flexible e-commerce solution. It includes transaction options, multi-store functionality, loyalty programs, product categorization and shopper filtering, promotion rules, and more.
 keywords:
--- a/bitnami/magento/templates/_helpers.tpl
+++ b/bitnami/magento/templates/_helpers.tpl
@@ -165,7 +165,7 @@ imagePullSecrets:
 {{- end -}}

 {{/*
-Return  the proper Storage Class for the master
+Return the proper Storage Class for Magento PVC
 */}}
 {{- define "magento.storageClass" -}}
 {{/*
@@ -175,25 +175,60 @@ 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.magento.storageClass -}}
              {{- if (eq "-" .Values.persistence.magento.storageClass) -}}
-                  {{- printf "\"\"" -}}
+                  {{- printf "storageClassName: \"\"" -}}
              {{- else }}
-                  {{- printf "%s" .Values.persistence.magento.storageClass -}}
+                  {{- printf "storageClassName: %s" .Values.persistence.magento.storageClass -}}
              {{- end -}}
        {{- end -}}
    {{- end -}}
 {{- else -}}
    {{- if .Values.persistence.magento.storageClass -}}
        {{- if (eq "-" .Values.persistence.magento.storageClass) -}}
-            {{- printf "\"\"" -}}
+            {{- printf "storageClassName: \"\"" -}}
        {{- else }}
-            {{- printf "%s" .Values.persistence.magento.storageClass -}}
+            {{- printf "storageClassName: %s" .Values.persistence.magento.storageClass -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the proper Storage Class Apache PVC
+*/}}
+{{- define "magento.apache.storageClass" -}}
+{{/*
+Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
+but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else logic.
+*/}}
+{{- if .Values.global -}}
+    {{- if .Values.global.storageClass -}}
+        {{- if (eq "-" .Values.global.storageClass) -}}
+            {{- printf "storageClassName: \"\"" -}}
+        {{- else }}
+            {{- printf "storageClassName: %s" .Values.global.storageClass -}}
+        {{- end -}}
+    {{- else -}}
+        {{- if .Values.persistence.apache.storageClass -}}
+              {{- if (eq "-" .Values.persistence.apache.storageClass) -}}
+                  {{- printf "storageClassName: \"\"" -}}
+              {{- else }}
+                  {{- printf "storageClassName: %s" .Values.persistence.apache.storageClass -}}
+              {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- else -}}
+    {{- if .Values.persistence.apache.storageClass -}}
+        {{- if (eq "-" .Values.persistence.apache.storageClass) -}}
+            {{- printf "storageClassName: \"\"" -}}
+        {{- else }}
+            {{- printf "storageClassName: %s" .Values.persistence.apache.storageClass -}}
        {{- end -}}
    {{- end -}}
 {{- end -}}
--- a/bitnami/magento/templates/apache-pvc.yaml
+++ b/bitnami/magento/templates/apache-pvc.yaml
@@ -14,11 +14,5 @@ spec:
  resources:
    requests:
      storage: {{ .Values.persistence.apache.size | quote }}
-{{- if .Values.persistence.apache.storageClass }}
-{{- if (eq "-" .Values.persistence.apache.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.apache.storageClass }}"
-{{- end }}
-{{- end }}
+  {{ include "magento.apache.storageClass" . }}
 {{- end -}}
--- a/bitnami/magento/templates/magento-pvc.yaml
+++ b/bitnami/magento/templates/magento-pvc.yaml
@@ -14,5 +14,5 @@ spec:
  resources:
    requests:
      storage: {{ .Values.persistence.magento.size | quote }}
-  storageClassName: {{ include "magento.storageClass" . }}
+  {{ include "magento.storageClass" . }}
 {{- end -}}
--- a/bitnami/mariadb-galera/Chart.yaml
+++ b/bitnami/mariadb-galera/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: mariadb-galera
-version: 0.2.1
+version: 0.2.2
 appVersion: 10.3.17
 description: MariaDB Galera is a multi-master database cluster solution for synchronous replication and high availability.
 keywords:
--- a/bitnami/mariadb-galera/templates/_helpers.tpl
+++ b/bitnami/mariadb-galera/templates/_helpers.tpl
@@ -211,7 +211,7 @@ mariadb-galera: LDAP
 {{- end -}}

 {{/*
-Return  the proper Storage Class
+Return the proper Storage Class
 */}}
 {{- define "mariadb-galera.storageClass" -}}
 {{/*
@@ -221,25 +221,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.storageClass -}}
              {{- if (eq "-" .Values.persistence.storageClass) -}}
-                  {{- printf "\"\"" -}}
+                  {{- printf "storageClassName: \"\"" -}}
              {{- else }}
-                  {{- printf "%s" .Values.persistence.storageClass -}}
+                  {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
              {{- end -}}
        {{- end -}}
    {{- end -}}
 {{- else -}}
    {{- if .Values.persistence.storageClass -}}
        {{- if (eq "-" .Values.persistence.storageClass) -}}
-            {{- printf "\"\"" -}}
+            {{- printf "storageClassName: \"\"" -}}
        {{- else }}
-            {{- printf "%s" .Values.persistence.storageClass -}}
+            {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
        {{- end -}}
    {{- end -}}
 {{- end -}}
--- a/bitnami/mariadb-galera/templates/statefulset.yaml
+++ b/bitnami/mariadb-galera/templates/statefulset.yaml
@@ -274,5 +274,5 @@ spec:
        resources:
          requests:
            storage: {{ .Values.persistence.size | quote }}
-        storageClassName: {{ include "mariadb-galera.storageClass" . }}
+        {{ include "mariadb-galera.storageClass" . }}
 {{- end }}
--- a/bitnami/minio/Chart.yaml
+++ b/bitnami/minio/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-version: 1.2.2
+version: 1.2.3
 appVersion: 2019.8.14
 description: MinIO is an object storage server, compatible with Amazon S3 cloud storage service, mainly used for storing unstructured data (such as photos, videos, log files, etc.)
 keywords:
--- a/bitnami/minio/templates/_helpers.tpl
+++ b/bitnami/minio/templates/_helpers.tpl
@@ -186,7 +186,7 @@ Also, we can't use a single if because lazy evaluation is not an option
 {{- end -}}

 {{/*
-Return  the proper Storage Class
+Return the proper Storage Class
 */}}
 {{- define "minio.storageClass" -}}
 {{/*
@@ -196,25 +196,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.storageClass -}}
              {{- if (eq "-" .Values.persistence.storageClass) -}}
-                  {{- printf "\"\"" -}}
+                  {{- printf "storageClassName: \"\"" -}}
              {{- else }}
-                  {{- printf "%s" .Values.persistence.storageClass -}}
+                  {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
              {{- end -}}
        {{- end -}}
    {{- end -}}
 {{- else -}}
    {{- if .Values.persistence.storageClass -}}
        {{- if (eq "-" .Values.persistence.storageClass) -}}
-            {{- printf "\"\"" -}}
+            {{- printf "storageClassName: \"\"" -}}
        {{- else }}
-            {{- printf "%s" .Values.persistence.storageClass -}}
+            {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
        {{- end -}}
    {{- end -}}
 {{- end -}}
--- a/bitnami/minio/templates/pvc-standalone.yaml
+++ b/bitnami/minio/templates/pvc-standalone.yaml
@@ -16,5 +16,5 @@ spec:
  resources:
    requests:
      storage: {{ .Values.persistence.size | quote }}
-  storageClassName: {{ include "minio.storageClass" . }}
+  {{ include "minio.storageClass" . }}
 {{- end }}
--- a/bitnami/minio/templates/statefulset.yaml
+++ b/bitnami/minio/templates/statefulset.yaml
@@ -176,7 +176,7 @@ spec:
      {{- end }}
    spec:
      accessModes: {{ toYaml .Values.persistence.accessModes | nindent 8 }}
-      storageClassName: {{ include "minio.storageClass" . }}
+      {{ include "minio.storageClass" . }}
      resources:
        requests:
          storage: {{ .Values.persistence.size | quote }}
--- a/bitnami/mxnet/Chart.yaml
+++ b/bitnami/mxnet/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: mxnet
-version: 1.3.1
+version: 1.3.2
 appVersion: 1.5.0
 description: A flexible and efficient library for deep learning
 keywords:
--- a/bitnami/mxnet/templates/_helpers.tpl
+++ b/bitnami/mxnet/templates/_helpers.tpl
@@ -216,7 +216,7 @@ Also, we can't use a single if because lazy evaluation is not an option
 {{- end -}}

 {{/*
-Return  the proper Storage Class
+Return the proper Storage Class
 */}}
 {{- define "mxnet.storageClass" -}}
 {{/*
@@ -226,25 +226,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.storageClass -}}
              {{- if (eq "-" .Values.persistence.storageClass) -}}
-                  {{- printf "\"\"" -}}
+                  {{- printf "storageClassName: \"\"" -}}
              {{- else }}
-                  {{- printf "%s" .Values.persistence.storageClass -}}
+                  {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
              {{- end -}}
        {{- end -}}
    {{- end -}}
 {{- else -}}
    {{- if .Values.persistence.storageClass -}}
        {{- if (eq "-" .Values.persistence.storageClass) -}}
-            {{- printf "\"\"" -}}
+            {{- printf "storageClassName: \"\"" -}}
        {{- else }}
-            {{- printf "%s" .Values.persistence.storageClass -}}
+            {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
        {{- end -}}
    {{- end -}}
 {{- end -}}
--- a/bitnami/mxnet/templates/deployment-pvc.yaml
+++ b/bitnami/mxnet/templates/deployment-pvc.yaml
@@ -16,5 +16,5 @@ spec:
  resources:
    requests:
      storage: {{ .Values.persistence.size | quote }}
-  storageClassName: {{ include "mxnet.storageClass" . }}
+  {{ include "mxnet.storageClass" . }}
 {{- end }}
--- a/bitnami/mxnet/templates/server-statefulset.yml
+++ b/bitnami/mxnet/templates/server-statefulset.yml
@@ -181,7 +181,7 @@ spec:
      {{- end }}
    spec:
      accessModes: {{ toYaml .Values.persistence.accessModes | nindent 8 }}
-      storageClassName: {{ include "mxnet.storageClass" . }}
+      {{ include "mxnet.storageClass" . }}
      resources:
        requests:
          storage: {{ .Values.persistence.size | quote }}
--- a/bitnami/mxnet/templates/worker-statefulset.yml
+++ b/bitnami/mxnet/templates/worker-statefulset.yml
@@ -181,7 +181,7 @@ spec:
      {{- end }}
    spec:
      accessModes: {{ toYaml .Values.persistence.accessModes | nindent 8 }}
-      storageClassName: {{ include "mxnet.storageClass" . }}
+      {{ include "mxnet.storageClass" . }}
      resources:
        requests:
          storage: {{ .Values.persistence.size | quote }}
--- a/bitnami/mysql/Chart.yaml
+++ b/bitnami/mysql/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: mysql
-version: 6.3.1
+version: 6.3.2
 appVersion: 8.0.17
 description: Chart to create a Highly available MySQL cluster
 keywords:
--- a/bitnami/mysql/templates/_helpers.tpl
+++ b/bitnami/mysql/templates/_helpers.tpl
@@ -164,7 +164,7 @@ Also, we can't use a single if because lazy evaluation is not an option
 {{- end -}}

 {{/*
-Return  the proper Storage Class for the master
+Return the proper Storage Class for the master
 */}}
 {{- define "mysql.master.storageClass" -}}
 {{/*
@@ -174,32 +174,32 @@ 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.master.persistence.storageClass -}}
              {{- if (eq "-" .Values.master.persistence.storageClass) -}}
-                  {{- printf "\"\"" -}}
+                  {{- printf "storageClassName: \"\"" -}}
              {{- else }}
-                  {{- printf "%s" .Values.master.persistence.storageClass -}}
+                  {{- printf "storageClassName: %s" .Values.master.persistence.storageClass -}}
              {{- end -}}
        {{- end -}}
    {{- end -}}
 {{- else -}}
    {{- if .Values.master.persistence.storageClass -}}
        {{- if (eq "-" .Values.master.persistence.storageClass) -}}
-            {{- printf "\"\"" -}}
+            {{- printf "storageClassName: \"\"" -}}
        {{- else }}
-            {{- printf "%s" .Values.master.persistence.storageClass -}}
+            {{- printf "storageClassName: %s" .Values.master.persistence.storageClass -}}
        {{- end -}}
    {{- end -}}
 {{- end -}}
 {{- end -}}

 {{/*
-Return  the proper Storage Class for the slave
+Return the proper Storage Class for the slave
 */}}
 {{- define "mysql.slave.storageClass" -}}
 {{/*
@@ -209,25 +209,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.slave.persistence.storageClass -}}
              {{- if (eq "-" .Values.slave.persistence.storageClass) -}}
-                  {{- printf "\"\"" -}}
+                  {{- printf "storageClassName: \"\"" -}}
              {{- else }}
-                  {{- printf "%s" .Values.slave.persistence.storageClass -}}
+                  {{- printf "storageClassName: %s" .Values.slave.persistence.storageClass -}}
              {{- end -}}
        {{- end -}}
    {{- end -}}
 {{- else -}}
    {{- if .Values.slave.persistence.storageClass -}}
        {{- if (eq "-" .Values.slave.persistence.storageClass) -}}
-            {{- printf "\"\"" -}}
+            {{- printf "storageClassName: \"\"" -}}
        {{- else }}
-            {{- printf "%s" .Values.slave.persistence.storageClass -}}
+            {{- printf "storageClassName: %s" .Values.slave.persistence.storageClass -}}
        {{- end -}}
    {{- end -}}
 {{- end -}}
--- a/bitnami/mysql/templates/master-statefulset.yaml
+++ b/bitnami/mysql/templates/master-statefulset.yaml
@@ -214,7 +214,7 @@ spec:
        resources:
          requests:
            storage: {{ .Values.master.persistence.size | quote }}
-        storageClassName: {{ include "mysql.master.storageClass" . }}
+        {{ include "mysql.master.storageClass" . }}
 {{- else }}
        - name: "data"
          emptyDir: {}
--- a/bitnami/mysql/templates/slave-statefulset.yaml
+++ b/bitnami/mysql/templates/slave-statefulset.yaml
@@ -190,7 +190,7 @@ spec:
        resources:
          requests:
            storage: {{ .Values.slave.persistence.size | quote }}
-        storageClassName: {{ include "mysql.slave.storageClass" . }}
+        {{ include "mysql.slave.storageClass" . }}
 {{- else }}
        - name: "data"
          emptyDir: {}
--- a/bitnami/mysql/values-production.yaml
+++ b/bitnami/mysql/values-production.yaml
@@ -14,7 +14,7 @@
 image:
  registry: docker.io
  repository: bitnami/mysql
-  tag: 8.0.17-debian-9-r1
+  tag: 8.0.17-debian-9-r26
  ## Specify a imagePullPolicy
  ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
  ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -293,7 +293,7 @@ metrics:
  image:
    registry: docker.io
    repository: bitnami/mysqld-exporter
-    tag: 0.12.0-debian-9-r2
+    tag: 0.12.1-debian-9-r24
    pullPolicy: IfNotPresent
    ## Optionally specify an array of imagePullSecrets.
    ## Secrets must be manually created in the namespace.
--- a/bitnami/mysql/values.yaml
+++ b/bitnami/mysql/values.yaml
@@ -14,7 +14,7 @@
 image:
  registry: docker.io
  repository: bitnami/mysql
-  tag: 8.0.17-debian-9-r1
+  tag: 8.0.17-debian-9-r26
  ## Specify a imagePullPolicy
  ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
  ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -293,7 +293,7 @@ metrics:
  image:
    registry: docker.io
    repository: bitnami/mysqld-exporter
-    tag: 0.12.0-debian-9-r2
+    tag: 0.12.1-debian-9-r24
    pullPolicy: IfNotPresent
    ## Optionally specify an array of imagePullSecrets.
    ## Secrets must be manually created in the namespace.
--- a/bitnami/node/Chart.yaml
+++ b/bitnami/node/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: node
-version: 11.1.1
+version: 11.1.2
 appVersion: 10.16.3
 description: Event-driven I/O server-side JavaScript environment based on V8
 keywords:
--- a/bitnami/node/templates/_helpers.tpl
+++ b/bitnami/node/templates/_helpers.tpl
@@ -172,7 +172,7 @@ Also, we can't use a single if because lazy evaluation is not an option
 {{- end -}}

 {{/*
-Return  the proper Storage Class
+Return the proper Storage Class
 */}}
 {{- define "node.storageClass" -}}
 {{/*
@@ -182,25 +182,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.storageClass -}}
              {{- if (eq "-" .Values.persistence.storageClass) -}}
-                  {{- printf "\"\"" -}}
+                  {{- printf "storageClassName: \"\"" -}}
              {{- else }}
-                  {{- printf "%s" .Values.persistence.storageClass -}}
+                  {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
              {{- end -}}
        {{- end -}}
    {{- end -}}
 {{- else -}}
    {{- if .Values.persistence.storageClass -}}
        {{- if (eq "-" .Values.persistence.storageClass) -}}
-            {{- printf "\"\"" -}}
+            {{- printf "storageClassName: \"\"" -}}
        {{- else }}
-            {{- printf "%s" .Values.persistence.storageClass -}}
+            {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
        {{- end -}}
    {{- end -}}
 {{- end -}}
--- a/bitnami/node/templates/pvc.yaml
+++ b/bitnami/node/templates/pvc.yaml
@@ -16,5 +16,5 @@ spec:
  resources:
    requests:
      storage: {{ .Values.persistence.size | quote }}
-  storageClassName: {{ include "node.storageClass" . }}
+  {{ include "node.storageClass" . }}
 {{- end }}
--- a/bitnami/pytorch/Chart.yaml
+++ b/bitnami/pytorch/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: pytorch
-version: 1.2.1
+version: 1.2.2
 appVersion: 1.2.0
 description: Deep learning platform that accelerates the transition from research prototyping to production deployment
 keywords:
--- a/bitnami/pytorch/templates/_helpers.tpl
+++ b/bitnami/pytorch/templates/_helpers.tpl
@@ -188,7 +188,7 @@ Also, we can't use a single if because lazy evaluation is not an option
 {{- end -}}

 {{/*
-Return  the proper Storage Class
+Return the proper Storage Class
 */}}
 {{- define "pytorch.storageClass" -}}
 {{/*
@@ -198,25 +198,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.storageClass -}}
              {{- if (eq "-" .Values.persistence.storageClass) -}}
-                  {{- printf "\"\"" -}}
+                  {{- printf "storageClassName: \"\"" -}}
              {{- else }}
-                  {{- printf "%s" .Values.persistence.storageClass -}}
+                  {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
              {{- end -}}
        {{- end -}}
    {{- end -}}
 {{- else -}}
    {{- if .Values.persistence.storageClass -}}
        {{- if (eq "-" .Values.persistence.storageClass) -}}
-            {{- printf "\"\"" -}}
+            {{- printf "storageClassName: \"\"" -}}
        {{- else }}
-            {{- printf "%s" .Values.persistence.storageClass -}}
+            {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
        {{- end -}}
    {{- end -}}
 {{- end -}}
--- a/bitnami/pytorch/templates/pvc.yaml
+++ b/bitnami/pytorch/templates/pvc.yaml
@@ -16,5 +16,5 @@ spec:
  resources:
    requests:
      storage: {{ .Values.persistence.size | quote }}
-  storageClassName: {{ include "pytorch.storageClass" . }}
+  {{ include "pytorch.storageClass" . }}
 {{- end }}
--- a/bitnami/pytorch/templates/statefulset.yml
+++ b/bitnami/pytorch/templates/statefulset.yml
@@ -161,7 +161,7 @@ spec:
      {{- end }}
    spec:
      accessModes: {{ toYaml .Values.persistence.accessModes | nindent 8 }}
-      storageClassName: {{ include "pytorch.storageClass" . }}
+      {{ include "pytorch.storageClass" . }}
      resources:
        requests:
          storage: {{ .Values.persistence.size | quote }}
--- a/bitnami/tomcat/Chart.yaml
+++ b/bitnami/tomcat/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: tomcat
-version: 4.3.1
+version: 4.3.2
 appVersion: 9.0.24
 description: Chart for Apache Tomcat
 keywords:
--- a/bitnami/tomcat/templates/_helpers.tpl
+++ b/bitnami/tomcat/templates/_helpers.tpl
@@ -122,25 +122,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.storageClass -}}
              {{- if (eq "-" .Values.persistence.storageClass) -}}
-                  {{- printf "\"\"" -}}
+                  {{- printf "storageClassName: \"\"" -}}
              {{- else }}
-                  {{- printf "%s" .Values.persistence.storageClass -}}
+                  {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
              {{- end -}}
        {{- end -}}
    {{- end -}}
 {{- else -}}
    {{- if .Values.persistence.storageClass -}}
        {{- if (eq "-" .Values.persistence.storageClass) -}}
-            {{- printf "\"\"" -}}
+            {{- printf "storageClassName: \"\"" -}}
        {{- else }}
-            {{- printf "%s" .Values.persistence.storageClass -}}
+            {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
        {{- end -}}
    {{- end -}}
 {{- end -}}
--- a/bitnami/tomcat/templates/pvc.yaml
+++ b/bitnami/tomcat/templates/pvc.yaml
@@ -9,12 +9,12 @@ metadata:
    release: "{{ .Release.Name }}"
    heritage: "{{ .Release.Service }}"
  annotations:
-    volume.alpha.kubernetes.io/storage-class: {{ ternary "default" (include "tomcat.storageClass" .) (empty (include "tomcat.storageClass" .)) }}
+    volume.alpha.kubernetes.io/storage-class: {{ ternary "default" (trimPrefix "storageClassName: " (include "tomcat.storageClass" .)) (empty (include "tomcat.storageClass" .)) }}
 spec:
  accessModes:
    - {{ .Values.persistence.accessMode | quote }}
  resources:
    requests:
      storage: {{ .Values.persistence.size | quote }}
-  storageClassName: {{ include "tomcat.storageClass" . }}
+  {{ include "tomcat.storageClass" . }}
 {{- end -}}
--- a/bitnami/wildfly/Chart.yaml
+++ b/bitnami/wildfly/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: wildfly
-version: 3.2.1
+version: 3.2.2
 appVersion: 17.0.1
 description: Chart for Wildfly
 keywords:
--- a/bitnami/wildfly/templates/_helpers.tpl
+++ b/bitnami/wildfly/templates/_helpers.tpl
@@ -105,7 +105,7 @@ Also, we can't use a single if because lazy evaluation is not an option
 {{- end -}}

 {{/*
-Return  the proper Storage Class
+Return the proper Storage Class
 */}}
 {{- define "wildfly.storageClass" -}}
 {{/*
@@ -115,25 +115,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.storageClass -}}
              {{- if (eq "-" .Values.persistence.storageClass) -}}
-                  {{- printf "\"\"" -}}
+                  {{- printf "storageClassName: \"\"" -}}
              {{- else }}
-                  {{- printf "%s" .Values.persistence.storageClass -}}
+                  {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
              {{- end -}}
        {{- end -}}
    {{- end -}}
 {{- else -}}
    {{- if .Values.persistence.storageClass -}}
        {{- if (eq "-" .Values.persistence.storageClass) -}}
-            {{- printf "\"\"" -}}
+            {{- printf "storageClassName: \"\"" -}}
        {{- else }}
-            {{- printf "%s" .Values.persistence.storageClass -}}
+            {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
        {{- end -}}
    {{- end -}}
 {{- end -}}
--- a/bitnami/wildfly/templates/pvc.yaml
+++ b/bitnami/wildfly/templates/pvc.yaml
@@ -9,12 +9,12 @@ metadata:
    release: "{{ .Release.Name }}"
    heritage: "{{ .Release.Service }}"
  annotations:
-    volume.alpha.kubernetes.io/storage-class: {{ ternary "default" (include "wildfly.storageClass" .) (empty (include "wildfly.storageClass" .)) }}
+    volume.alpha.kubernetes.io/storage-class: {{ ternary "default" (trimPrefix "storageClassName: " (include "wildfly.storageClass" .)) (empty (include "wildfly.storageClass" .)) }}
 spec:
  accessModes:
    - {{ .Values.persistence.accessMode | quote }}
  resources:
    requests:
      storage: {{ .Values.persistence.size | quote }}
-  storageClassName: {{ include "wildfly.storageClass" . }}
+  {{ include "wildfly.storageClass" . }}
 {{- end -}}
--- a/bitnami/zookeeper/Chart.yaml
+++ b/bitnami/zookeeper/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: zookeeper
-version: 4.3.1
+version: 4.3.2
 appVersion: 3.5.5
 description: A centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services for distributed applications.
 keywords:
--- a/bitnami/zookeeper/templates/_helpers.tpl
+++ b/bitnami/zookeeper/templates/_helpers.tpl
@@ -164,7 +164,7 @@ Also, we can't use a single if because lazy evaluation is not an option
 {{- end -}}

 {{/*
-Return  the proper Storage Class
+Return the proper Storage Class
 */}}
 {{- define "zookeeper.storageClass" -}}
 {{/*
@@ -174,25 +174,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.storageClass -}}
              {{- if (eq "-" .Values.persistence.storageClass) -}}
-                  {{- printf "\"\"" -}}
+                  {{- printf "storageClassName: \"\"" -}}
              {{- else }}
-                  {{- printf "%s" .Values.persistence.storageClass -}}
+                  {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
              {{- end -}}
        {{- end -}}
    {{- end -}}
 {{- else -}}
    {{- if .Values.persistence.storageClass -}}
        {{- if (eq "-" .Values.persistence.storageClass) -}}
-            {{- printf "\"\"" -}}
+            {{- printf "storageClassName: \"\"" -}}
        {{- else }}
-            {{- printf "%s" .Values.persistence.storageClass -}}
+            {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
        {{- end -}}
    {{- end -}}
 {{- end -}}
--- a/bitnami/zookeeper/templates/statefulset.yaml
+++ b/bitnami/zookeeper/templates/statefulset.yaml
@@ -194,7 +194,7 @@ spec:
        resources:
          requests:
            storage: {{ .Values.persistence.size | quote }}
-        storageClassName: {{ include "zookeeper.storageClass" . }}
+        {{ include "zookeeper.storageClass" . }}
 {{- else }}
        - name: data
          emptyDir: {}