From 7ab1ac82cd547d319a3cf500cc8d99df8fff78b1 Mon Sep 17 00:00:00 2001 From: Alejandro Moreno <47833905+alemorcuq@users.noreply.github.com> Date: Fri, 23 Aug 2019 09:53:28 +0200 Subject: [PATCH] [stable/jasperreports] Fix 'storageClass' macros (#16540) * Fix 'storageClass' macros Signed-off-by: Alejandro Moreno * [stable/parse] Update MariaDB dependency Signed-off-by: juan131 --- stable/jasperreports/Chart.yaml | 2 +- stable/jasperreports/requirements.lock | 4 ++-- stable/jasperreports/templates/_helpers.tpl | 12 ++++++------ stable/jasperreports/templates/pvc.yaml | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/stable/jasperreports/Chart.yaml b/stable/jasperreports/Chart.yaml index c4e7871d90..4fa51b8881 100644 --- a/stable/jasperreports/Chart.yaml +++ b/stable/jasperreports/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: jasperreports -version: 6.1.1 +version: 6.1.2 appVersion: 7.2.0 description: The JasperReports server can be used as a stand-alone or embedded reporting and BI server that offers web-based reporting, analytic tools and visualization, diff --git a/stable/jasperreports/requirements.lock b/stable/jasperreports/requirements.lock index e4f8f25f41..deb5fc902a 100644 --- a/stable/jasperreports/requirements.lock +++ b/stable/jasperreports/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 6.7.4 + version: 6.8.2 digest: sha256:a363428d6463718a9523a88c70e485218373e315f2979cb1bb17b034ec2be96a -generated: 2019-08-09T07:46:22.111114651Z +generated: "2019-08-23T09:24:14.047517+02:00" diff --git a/stable/jasperreports/templates/_helpers.tpl b/stable/jasperreports/templates/_helpers.tpl index f12ff3170e..99ec0448ab 100644 --- a/stable/jasperreports/templates/_helpers.tpl +++ b/stable/jasperreports/templates/_helpers.tpl @@ -101,25 +101,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/jasperreports/templates/pvc.yaml b/stable/jasperreports/templates/pvc.yaml index a16ed1c97f..2251c62cd4 100644 --- a/stable/jasperreports/templates/pvc.yaml +++ b/stable/jasperreports/templates/pvc.yaml @@ -14,5 +14,5 @@ spec: resources: requests: storage: {{ .Values.persistence.size | quote }} - storageClassName: {{ include "jasperreports.storageClass" . }} + {{ include "jasperreports.storageClass" . }} {{- end -}}