From 226a805be8abaec0bc97e92e0005196470e8fde1 Mon Sep 17 00:00:00 2001
From: Guang Ya Liu <gyliu513@gmail.com>
Date: Sat, 23 Dec 2017 00:37:36 +0800
Subject: [PATCH] [stable/dokuwiki] Use storageClassName for dokuwiki. (#1988)

---
 stable/dokuwiki/Chart.yaml                  |  2 +-
 stable/dokuwiki/templates/apache-pvc.yaml   | 13 +++++++------
 stable/dokuwiki/templates/dokuwiki-pvc.yaml | 13 +++++++------
 stable/dokuwiki/values.yaml                 | 20 ++++++++++++++------
 4 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/stable/dokuwiki/Chart.yaml b/stable/dokuwiki/Chart.yaml
index 28f47b7243..4a0bf6a671 100644
--- a/stable/dokuwiki/Chart.yaml
+++ b/stable/dokuwiki/Chart.yaml
@@ -1,5 +1,5 @@
 name: dokuwiki
-version: 0.2.0
+version: 0.2.1
 description: DokuWiki is a standards-compliant, simple to use wiki optimized for creating
   documentation. It is targeted at developer teams, workgroups, and small companies.
   All data is stored in plain text files, so no database is required.
diff --git a/stable/dokuwiki/templates/apache-pvc.yaml b/stable/dokuwiki/templates/apache-pvc.yaml
index e478e72691..8e5a3b4019 100644
--- a/stable/dokuwiki/templates/apache-pvc.yaml
+++ b/stable/dokuwiki/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/dokuwiki/templates/dokuwiki-pvc.yaml b/stable/dokuwiki/templates/dokuwiki-pvc.yaml
index 9cdef4fbe3..6dae8337f8 100644
--- a/stable/dokuwiki/templates/dokuwiki-pvc.yaml
+++ b/stable/dokuwiki/templates/dokuwiki-pvc.yaml
@@ -8,16 +8,17 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
-  annotations:
-  {{- if .Values.persistence.dokuwiki.storageClass }}
-    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.dokuwiki.storageClass | quote }}
-  {{- else }}
-    volume.alpha.kubernetes.io/storage-class: default
-  {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.dokuwiki.accessMode | quote }}
   resources:
     requests:
       storage: {{ .Values.persistence.dokuwiki.size | quote }}
+{{- if .Values.persistence.dokuwiki.storageClass }}
+{{- if (eq "-" .Values.persistence.dokuwiki.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.persistence.dokuwiki.storageClass }}"
+{{- end }}
+{{- end }}
 {{- end -}}
diff --git a/stable/dokuwiki/values.yaml b/stable/dokuwiki/values.yaml
index 404ba681f0..27bd62f792 100644
--- a/stable/dokuwiki/values.yaml
+++ b/stable/dokuwiki/values.yaml
@@ -45,17 +45,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
   dokuwiki:
-    ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
-    ## Default: volume.alpha.kubernetes.io/storage-class: default
+    ## dokuwiki 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