mirror of
https://github.com/helm/charts.git
synced 2026-08-23 22:37:45 +00:00
[stable/ghost] Fix 'storageClass' macros (#16539)
* Fix 'storageClass' macros Signed-off-by: Alejandro Moreno <amoreno@bitnami.com> * Bump chart version (fix storageclass) Signed-off-by: Alejandro Moreno <amoreno@bitnami.com> * Update MariaDB dependency Signed-off-by: juan131 <juan@bitnami.com> * Rebase master Signed-off-by: juan131 <juan@bitnami.com>
This commit is contained in:
committed by
Kubernetes Prow Robot
parent
7008198224
commit
ab01cc70cd
@@ -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:
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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 -}}
|
||||
|
||||
@@ -14,5 +14,5 @@ spec:
|
||||
resources:
|
||||
requests:
|
||||
storage: {{ .Values.persistence.size | quote }}
|
||||
storageClassName: {{ include "ghost.storageClass" . }}
|
||||
{{ include "ghost.storageClass" . }}
|
||||
{{- end -}}
|
||||
|
||||
Reference in New Issue
Block a user