[stable/drupal] Fix 'storageClass' macros (#16538)

* Fix 'storageClass' macros

Signed-off-by: Alejandro Moreno <amoreno@bitnami.com>

* [stable/parse] Update MariaDB dependency

Signed-off-by: juan131 <juan@bitnami.com>
This commit is contained in:
Alejandro Moreno
2019-08-23 00:53:17 -07:00
committed by Kubernetes Prow Robot
parent 1b47267444
commit 8b2a0b8a3e
4 changed files with 10 additions and 10 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: drupal
version: 5.1.1
version: 5.1.2
appVersion: 8.7.5
description: One of the most versatile open source content management systems.
keywords:
+2 -2
View File
@@ -1,6 +1,6 @@
dependencies:
- name: mariadb
repository: https://kubernetes-charts.storage.googleapis.com/
version: 6.7.2
version: 6.8.2
digest: sha256:a363428d6463718a9523a88c70e485218373e315f2979cb1bb17b034ec2be96a
generated: "2019-07-25T09:25:00.878691+02:00"
generated: "2019-08-23T09:23:35.981415+02:00"
+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.drupal.storageClass -}}
{{- if (eq "-" .Values.persistence.drupal.storageClass) -}}
{{- printf "\"\"" -}}
{{- printf "storageClassName: \"\"" -}}
{{- else }}
{{- printf "%s" .Values.persistence.drupal.storageClass -}}
{{- printf "storageClassName: %s" .Values.persistence.drupal.storageClass -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{- else -}}
{{- if .Values.persistence.drupal.storageClass -}}
{{- if (eq "-" .Values.persistence.drupal.storageClass) -}}
{{- printf "\"\"" -}}
{{- printf "storageClassName: \"\"" -}}
{{- else }}
{{- printf "%s" .Values.persistence.drupal.storageClass -}}
{{- printf "storageClassName: %s" .Values.persistence.drupal.storageClass -}}
{{- end -}}
{{- end -}}
{{- end -}}
+1 -1
View File
@@ -17,5 +17,5 @@ spec:
resources:
requests:
storage: {{ .Values.persistence.drupal.size | quote }}
storageClassName: {{ include "drupal.storageClass" . }}
{{ include "drupal.storageClass" . }}
{{- end -}}