github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix 'storageClass' macros (#16541)

Browse Source 
Signed-off-by: Alejandro Moreno <amoreno@bitnami.com>
This commit is contained in:
Alejandro Moreno
2019-08-22 05:44:31 -07:00
committed by Kubernetes Prow Robot
parent 3dfac1321f
commit c595c7c640
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/joomla/Chart.yaml
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: joomla
version: 6.1.1
version: 6.1.2
appVersion: 3.9.11
description: PHP content management system (CMS) for publishing web content
keywords:
stable/joomla/templates/_helpers.tpl
+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.joomla.storageClass -}}
{{- if (eq "-" .Values.persistence.joomla.storageClass) -}}
{{- printf "\"\"" -}}
{{- printf "storageClassName: \"\"" -}}
{{- else }}
{{- printf "%s" .Values.persistence.joomla.storageClass -}}
{{- printf "storageClassName: %s" .Values.persistence.joomla.storageClass -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{- else -}}
{{- if .Values.persistence.joomla.storageClass -}}
{{- if (eq "-" .Values.persistence.joomla.storageClass) -}}
{{- printf "\"\"" -}}
{{- printf "storageClassName: \"\"" -}}
{{- else }}
{{- printf "%s" .Values.persistence.joomla.storageClass -}}
{{- printf "storageClassName: %s" .Values.persistence.joomla.storageClass -}}
{{- end -}}
{{- end -}}
{{- end -}}
stable/joomla/templates/joomla-pvc.yaml
+1 -1
View File
@@ -14,5 +14,5 @@ spec:
resources:
requests:
storage: {{ .Values.persistence.joomla.size | quote }}
storageClassName: {{ include "joomla.storageClass" . }}
{{ include "joomla.storageClass" . }}
{{- end -}}