From 994491737ff6a0152632374fd1ca326411523c83 Mon Sep 17 00:00:00 2001
From: Guangya Liu <gyliu513@gmail.com>
Date: Mon, 4 Sep 2017 11:23:36 +0800
Subject: [PATCH] [stable/chronograf] Use storageClassName for chronograf.

---
 stable/chronograf/Chart.yaml         |  2 +-
 stable/chronograf/templates/pvc.yaml | 13 +++++++------
 stable/chronograf/values.yaml        | 10 +++++++---
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/stable/chronograf/Chart.yaml b/stable/chronograf/Chart.yaml
index 93cfd1c4d353..5e1757bb49c7 100755
--- a/stable/chronograf/Chart.yaml
+++ b/stable/chronograf/Chart.yaml
@@ -1,5 +1,5 @@
 name: chronograf
-version: 0.2.1
+version: 0.2.2
 description: Open-source web application written in Go and React.js that provides the tools to visualize your monitoring data and easily create alerting and automation rules.
 keywords:
 - chronograf
diff --git a/stable/chronograf/templates/pvc.yaml b/stable/chronograf/templates/pvc.yaml
index a7bc8ad16c66..ca21861996f8 100644
--- a/stable/chronograf/templates/pvc.yaml
+++ b/stable/chronograf/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.persistencestorageClass }}
+{{- if (eq "-" .Values.persistence.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.persistence.storageClass }}"
+{{- end }}
+{{- end }}
 {{- end }}
diff --git a/stable/chronograf/values.yaml b/stable/chronograf/values.yaml
index ad8e88e6e3eb..59ec1df6eab7 100644
--- a/stable/chronograf/values.yaml
+++ b/stable/chronograf/values.yaml
@@ -17,10 +17,14 @@ service:
 ##
 persistence:
   enabled: false
-  ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
-  ## Default: volume.alpha.kubernetes.io/storage-class: default
+  ## chronograf 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