From cbbadb67bc9fe1e7f0322ba2fee554e1a159a4f8 Mon Sep 17 00:00:00 2001
From: Guang Ya Liu <gyliu513@gmail.com>
Date: Mon, 11 Sep 2017 01:19:54 +0800
Subject: [PATCH] [stable/moodle] Use storageClassName for moodle. (#2014)

* [stable/moodle] Use storageClassName for moodle.

* Bump chart version
---
 stable/moodle/Chart.yaml         |  2 +-
 stable/moodle/templates/pvc.yaml | 13 +++++++------
 stable/moodle/values.yaml        | 20 ++++++++++++++------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/stable/moodle/Chart.yaml b/stable/moodle/Chart.yaml
index 9848c3a9ad..c5c814825f 100644
--- a/stable/moodle/Chart.yaml
+++ b/stable/moodle/Chart.yaml
@@ -1,5 +1,5 @@
 name: moodle
-version: 0.2.3
+version: 0.3.0
 appVersion: 3.3.2
 description: Moodle is a learning platform designed to provide educators, administrators and learners with a single robust, secure and integrated system to create personalised learning environments
 keywords:
diff --git a/stable/moodle/templates/pvc.yaml b/stable/moodle/templates/pvc.yaml
index 2424b389ce..980d494c54 100644
--- a/stable/moodle/templates/pvc.yaml
+++ b/stable/moodle/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/moodle/values.yaml b/stable/moodle/values.yaml
index 43300febe4..6cfb169d9d 100644
--- a/stable/moodle/values.yaml
+++ b/stable/moodle/values.yaml
@@ -46,10 +46,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
 #    existingClaim: ""
@@ -118,10 +122,14 @@ ingress:
 ##
 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
   #existingClaim: ""