From c6f5d37345ca13dd1c65c7b4dc8c47b516530b5a Mon Sep 17 00:00:00 2001
From: Guangya Liu <gyliu513@gmail.com>
Date: Tue, 5 Sep 2017 13:01:04 +0800
Subject: [PATCH] [stable/jasperreports] Use storageClassName for
 jasperreports.

---
 stable/jasperreports/Chart.yaml         |  2 +-
 stable/jasperreports/templates/pvc.yaml | 13 +++++++------
 stable/jasperreports/values.yaml        | 20 ++++++++++++++------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/stable/jasperreports/Chart.yaml b/stable/jasperreports/Chart.yaml
index c0f6c754a5f4..7aa0a0bf4263 100644
--- a/stable/jasperreports/Chart.yaml
+++ b/stable/jasperreports/Chart.yaml
@@ -1,5 +1,5 @@
 name: jasperreports
-version: 0.2.0
+version: 0.2.1
 appVersion: 6.4.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/templates/pvc.yaml b/stable/jasperreports/templates/pvc.yaml
index 5f0f089f372c..e397a57a7030 100644
--- a/stable/jasperreports/templates/pvc.yaml
+++ b/stable/jasperreports/templates/pvc.yaml
@@ -8,16 +8,17 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
-  annotations:
-  {{- if .Values.persistence.storageClass }}
-    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
-  {{- else }}
-    volume.alpha.kubernetes.io/storage-class: default
-  {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.accessMode | quote }}
   resources:
     requests:
       storage: {{ .Values.persistence.size | quote }}
+{{- if .Values.persistence.storageClass }}
+{{- if (eq "-" .Values.persistence.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.persistence.storageClass }}"
+{{- end }}
+{{- end }}
 {{- end -}}
diff --git a/stable/jasperreports/values.yaml b/stable/jasperreports/values.yaml
index e37a6e062efe..f3a926f0270c 100644
--- a/stable/jasperreports/values.yaml
+++ b/stable/jasperreports/values.yaml
@@ -48,10 +48,14 @@ mariadb:
   ##
   persistence:
     enabled: true
-    ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
-    ## Default: volume.alpha.kubernetes.io/storage-class: default
+    ## mariadb data Persistent Volume Storage Class
+    ## If defined, storageClassName: <storageClass>
+    ## If set to "-", storageClassName: "", which disables dynamic provisioning
+    ## If undefined (the default) or set to null, no storageClassName spec is
+    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+    ##   GKE, AWS & OpenStack)
     ##
-    # storageClass:
+    # storageClass: "-"
     accessMode: ReadWriteOnce
     size: 8Gi
 
@@ -65,10 +69,14 @@ serviceType: LoadBalancer
 ##
 persistence:
   enabled: true
-  ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
-  ## Default: volume.alpha.kubernetes.io/storage-class: default
+  ## database data Persistent Volume Storage Class
+  ## If defined, storageClassName: <storageClass>
+  ## If set to "-", storageClassName: "", which disables dynamic provisioning
+  ## If undefined (the default) or set to null, no storageClassName spec is
+  ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+  ##   GKE, AWS & OpenStack)
   ##
-  # storageClass:
+  # storageClass: "-"
   accessMode: ReadWriteOnce
   size: 8Gi