Fix 'storageClass' macros (#16552)

Signed-off-by: Alejandro Moreno <amoreno@bitnami.com>
This commit is contained in:
Alejandro Moreno
2019-08-22 09:54:32 -07:00
committed by Kubernetes Prow Robot
parent 9b50c86f79
commit 365dfa8d28
3 changed files with 8 additions and 8 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: phpbb
version: 6.1.1
version: 6.1.2
appVersion: 3.2.7
description: Community forum that supports the notion of users and groups, file attachments, full-text search, notifications and more.
keywords:
+6 -6
View File
@@ -130,25 +130,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.phpbb.storageClass -}}
{{- if (eq "-" .Values.persistence.phpbb.storageClass) -}}
{{- printf "\"\"" -}}
{{- printf "storageClassName: \"\"" -}}
{{- else }}
{{- printf "%s" .Values.persistence.phpbb.storageClass -}}
{{- printf "storageClassName: %s" .Values.persistence.phpbb.storageClass -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{- else -}}
{{- if .Values.persistence.phpbb.storageClass -}}
{{- if (eq "-" .Values.persistence.phpbb.storageClass) -}}
{{- printf "\"\"" -}}
{{- printf "storageClassName: \"\"" -}}
{{- else }}
{{- printf "%s" .Values.persistence.phpbb.storageClass -}}
{{- printf "storageClassName: %s" .Values.persistence.phpbb.storageClass -}}
{{- end -}}
{{- end -}}
{{- end -}}
+1 -1
View File
@@ -14,5 +14,5 @@ spec:
resources:
requests:
storage: {{ .Values.persistence.phpbb.size | quote }}
storageClassName: {{ include "phpbb.storageClass" . }}
{{ include "phpbb.storageClass" . }}
{{- end -}}