From 8526d886dcafaee091b37cda9a1940e2beb03679 Mon Sep 17 00:00:00 2001
From: Guang Ya Liu <gyliu513@gmail.com>
Date: Mon, 11 Sep 2017 00:13:47 +0800
Subject: [PATCH] [stable/percona] Use storageClassName for percona. (#2023)

---
 stable/percona/Chart.yaml         |  2 +-
 stable/percona/templates/pvc.yaml | 13 +++++++------
 stable/percona/values.yaml        | 12 ++++++++----
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/stable/percona/Chart.yaml b/stable/percona/Chart.yaml
index dcb01666f6..3f86b6feae 100644
--- a/stable/percona/Chart.yaml
+++ b/stable/percona/Chart.yaml
@@ -1,5 +1,5 @@
 name: percona 
-version: 0.2.1
+version: 0.2.2
 description: free, fully compatible, enhanced, open source drop-in replacement for MySQL
 keywords:
 - mysql
diff --git a/stable/percona/templates/pvc.yaml b/stable/percona/templates/pvc.yaml
index 6a21fe551b..e185d0473d 100644
--- a/stable/percona/templates/pvc.yaml
+++ b/stable/percona/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/percona/values.yaml b/stable/percona/values.yaml
index db61556543..d9287dbf1c 100644
--- a/stable/percona/values.yaml
+++ b/stable/percona/values.yaml
@@ -29,11 +29,15 @@ imagePullPolicy: IfNotPresent
 
 ## Persist data to a persitent volume
 persistence:
-  enabled: false 
-  ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
-  ## Default: volume.alpha.kubernetes.io/storage-class: default
+  enabled: false
+  ## percona 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