From ab01cc70cdde30f7d5bd11c9a7ae6ee4f957796b Mon Sep 17 00:00:00 2001 From: Alejandro Moreno <47833905+alemorcuq@users.noreply.github.com> Date: Thu, 22 Aug 2019 20:06:32 +0200 Subject: [PATCH] [stable/ghost] Fix 'storageClass' macros (#16539) * Fix 'storageClass' macros Signed-off-by: Alejandro Moreno * Bump chart version (fix storageclass) Signed-off-by: Alejandro Moreno * Update MariaDB dependency Signed-off-by: juan131 * Rebase master Signed-off-by: juan131 --- stable/ghost/Chart.yaml | 2 +- stable/ghost/requirements.lock | 4 ++-- stable/ghost/templates/_helpers.tpl | 12 ++++++------ stable/ghost/templates/pvc.yaml | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/stable/ghost/Chart.yaml b/stable/ghost/Chart.yaml index 37d7a5a353..24d566bef4 100644 --- a/stable/ghost/Chart.yaml +++ b/stable/ghost/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: ghost -version: 7.1.2 +version: 7.1.3 appVersion: 2.29.0 description: A simple, powerful publishing platform that allows you to share your stories with the world keywords: diff --git a/stable/ghost/requirements.lock b/stable/ghost/requirements.lock index 0f8cb6de98..6b1addd6e0 100644 --- a/stable/ghost/requirements.lock +++ b/stable/ghost/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 6.8.1 + version: 6.8.2 digest: sha256:234702bf5dbec8956e4f113b783db5559f7d3cbf60abf8a89c7a3c73b3c79c5c -generated: 2019-08-21T16:44:53.973158451Z +generated: "2019-08-22T19:18:12.382202+02:00" diff --git a/stable/ghost/templates/_helpers.tpl b/stable/ghost/templates/_helpers.tpl index 0c9a6afe41..f8aef07b72 100644 --- a/stable/ghost/templates/_helpers.tpl +++ b/stable/ghost/templates/_helpers.tpl @@ -156,25 +156,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 -}} diff --git a/stable/ghost/templates/pvc.yaml b/stable/ghost/templates/pvc.yaml index 57e546f36e..b47108bde9 100644 --- a/stable/ghost/templates/pvc.yaml +++ b/stable/ghost/templates/pvc.yaml @@ -14,5 +14,5 @@ spec: resources: requests: storage: {{ .Values.persistence.size | quote }} - storageClassName: {{ include "ghost.storageClass" . }} + {{ include "ghost.storageClass" . }} {{- end -}}