From ced74c7a8a861dd5937f672f43ea5d0cebdc0e33 Mon Sep 17 00:00:00 2001
From: Guang Ya Liu <gyliu513@gmail.com>
Date: Mon, 11 Sep 2017 00:26:09 +0800
Subject: [PATCH] [stable/magento] Use storageClassName for magento. (#2008)

---
 stable/magento/Chart.yaml                 |  2 +-
 stable/magento/templates/apache-pvc.yaml  | 13 +++++-----
 stable/magento/templates/magento-pvc.yaml | 13 +++++-----
 stable/magento/values.yaml                | 30 ++++++++++++++++-------
 4 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/stable/magento/Chart.yaml b/stable/magento/Chart.yaml
index 6c795d8915..6cdefa221a 100644
--- a/stable/magento/Chart.yaml
+++ b/stable/magento/Chart.yaml
@@ -1,5 +1,5 @@
 name: magento
-version: 0.4.13
+version: 0.4.14
 appVersion: 2.1.8
 description: A feature-rich flexible e-commerce solution. It includes transaction options, multi-store functionality, loyalty programs, product categorization and shopper filtering, promotion rules, and more.
 keywords:
diff --git a/stable/magento/templates/apache-pvc.yaml b/stable/magento/templates/apache-pvc.yaml
index 166feb8b9f..1ae6762ef2 100644
--- a/stable/magento/templates/apache-pvc.yaml
+++ b/stable/magento/templates/apache-pvc.yaml
@@ -8,16 +8,17 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
-  annotations:
-  {{- if .Values.persistence.apache.storageClass }}
-    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.apache.storageClass | quote }}
-  {{- else }}
-    volume.alpha.kubernetes.io/storage-class: default
-  {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.apache.accessMode | quote }}
   resources:
     requests:
       storage: {{ .Values.persistence.apache.size | quote }}
+{{- if .Values.persistence.apache.storageClass }}
+{{- if (eq "-" .Values.persistence.apache.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.persistence.apache.storageClass }}"
+{{- end }}
+{{- end }}
 {{- end -}}
diff --git a/stable/magento/templates/magento-pvc.yaml b/stable/magento/templates/magento-pvc.yaml
index 3e11c4c515..47c9b040d4 100644
--- a/stable/magento/templates/magento-pvc.yaml
+++ b/stable/magento/templates/magento-pvc.yaml
@@ -8,16 +8,17 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
-  annotations:
-  {{- if .Values.persistence.magento.storageClass }}
-    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.magento.storageClass | quote }}
-  {{- else }}
-    volume.alpha.kubernetes.io/storage-class: default
-  {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.magento.accessMode | quote }}
   resources:
     requests:
       storage: {{ .Values.persistence.magento.size | quote }}
+{{- if .Values.persistence.magento.storageClass }}
+{{- if (eq "-" .Values.persistence.magento.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.persistence.magento.storageClass }}"
+{{- end }}
+{{- end }}
 {{- end -}}
diff --git a/stable/magento/values.yaml b/stable/magento/values.yaml
index 7246f1c6e6..9bb7355932 100644
--- a/stable/magento/values.yaml
+++ b/stable/magento/values.yaml
@@ -70,10 +70,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
 
@@ -88,17 +92,25 @@ serviceType: LoadBalancer
 persistence:
   enabled: true
   apache:
-    ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
-    ## Default: volume.alpha.kubernetes.io/storage-class: default
+    ## apache 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: 1Gi
   magento:
-    ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
-    ## Default: volume.alpha.kubernetes.io/storage-class: default
+    ## magento 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