From 6e56b90aef2df31d6d391d8b61098bce32d474cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20=C3=81ngel=20Cabrera=20Mi=C3=B1agorri?=
 <macabrera@bitnami.com>
Date: Tue, 20 Aug 2019 11:54:22 +0200
Subject: [PATCH] [stable/joomla] Add global StorageClass to joomla (#16430)

Signed-off-by: Miguel A. Cabrera Minagorri <macabrera@bitnami.com>
---
 stable/joomla/Chart.yaml                |  2 +-
 stable/joomla/README.md                 |  1 +
 stable/joomla/templates/_helpers.tpl    | 20 ++++++++++++++++++++
 stable/joomla/templates/joomla-pvc.yaml |  8 +-------
 stable/joomla/values.yaml               |  1 +
 5 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/stable/joomla/Chart.yaml b/stable/joomla/Chart.yaml
index ece4cfec46..a1a2d0646c 100644
--- a/stable/joomla/Chart.yaml
+++ b/stable/joomla/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: joomla
-version: 6.0.1
+version: 6.1.0
 appVersion: 3.9.11
 description: PHP content management system (CMS) for publishing web content
 keywords:
diff --git a/stable/joomla/README.md b/stable/joomla/README.md
index 905beed812..c2fe181ab4 100644
--- a/stable/joomla/README.md
+++ b/stable/joomla/README.md
@@ -51,6 +51,7 @@ The following table lists the configurable parameters of the Joomla! chart and t
 | ------------------------------------ | --------------------------------------------------------------------------------------------------- | ------------------------------------------------------------ |
 | `global.imageRegistry`               | Global Docker image registry                                                                        | `nil`                                                        |
 | `global.imagePullSecrets`            | Global Docker registry secret names as an array                                                     | `[]` (does not add image pull secrets to deployed pods)      |
+| `global.storageClass`                     | Global storage class for dynamic provisioning                                               | `nil`                                                        |
 | `image.registry`                     | Joomla! image registry                                                                              | `docker.io`                                                  |
 | `image.repository`                   | Joomla! Image name                                                                                  | `bitnami/joomla`                                             |
 | `image.tag`                          | Joomla! Image tag                                                                                   | `{TAG_NAME}`                                                 |
diff --git a/stable/joomla/templates/_helpers.tpl b/stable/joomla/templates/_helpers.tpl
index d81e51cd63..ecb16e5aef 100644
--- a/stable/joomla/templates/_helpers.tpl
+++ b/stable/joomla/templates/_helpers.tpl
@@ -118,3 +118,23 @@ imagePullSecrets:
 {{- end }}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Return  the proper Storage Class
+*/}}
+{{- define "joomla.storageClass" -}}
+{{- $storageClass := "" }}
+{{- if .Values.persistence.joomla.storageClass -}}
+    {{- $storageClass = .Values.persistence.joomla.storageClass -}}
+{{- end -}}
+{{- if .Values.global -}}
+    {{- if .Values.global.storageClass -}}
+        {{- $storageClass = .Values.global.storageClass -}}
+    {{- end -}}
+{{- end -}}
+{{- if (eq "-" $storageClass) -}}
+    {{- printf "\"\"" -}}
+{{- else }}
+    {{- printf "%s" $storageClass -}}
+{{- end -}}
+{{- end -}}
diff --git a/stable/joomla/templates/joomla-pvc.yaml b/stable/joomla/templates/joomla-pvc.yaml
index 2b742c605b..a8e9d8129a 100644
--- a/stable/joomla/templates/joomla-pvc.yaml
+++ b/stable/joomla/templates/joomla-pvc.yaml
@@ -14,11 +14,5 @@ spec:
   resources:
     requests:
       storage: {{ .Values.persistence.joomla.size | quote }}
-{{- if .Values.persistence.joomla.storageClass }}
-{{- if (eq "-" .Values.persistence.joomla.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: {{ .Values.persistence.joomla.storageClass | quote }}
-{{- end }}
-{{- end }}
+  storageClassName: {{ include "joomla.storageClass" . }}
 {{- end -}}
diff --git a/stable/joomla/values.yaml b/stable/joomla/values.yaml
index 7be41e9785..270ac7a94e 100644
--- a/stable/joomla/values.yaml
+++ b/stable/joomla/values.yaml
@@ -6,6 +6,7 @@
 #   imageRegistry: myRegistryName
 #   imagePullSecrets:
 #     - myRegistryKeySecretName
+#   storageClass: myStorageClass
 
 ## Bitnami Joomla! image version
 ## ref: https://hub.docker.com/r/bitnami/dokuwiki/tags/