From e0c698b1c9aaa4f587e4548e0c0977924e418006 Mon Sep 17 00:00:00 2001
From: Guang Ya Liu <gyliu513@gmail.com>
Date: Mon, 11 Sep 2017 00:08:12 +0800
Subject: [PATCH] [stable/redmine] Use storageClassName for redmine. (#2029)

---
 stable/redmine/Chart.yaml         |  2 +-
 stable/redmine/templates/pvc.yaml | 13 +++++++------
 stable/redmine/values.yaml        | 30 +++++++++++++++++++++---------
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/stable/redmine/Chart.yaml b/stable/redmine/Chart.yaml
index d605212169..fbe521b424 100644
--- a/stable/redmine/Chart.yaml
+++ b/stable/redmine/Chart.yaml
@@ -1,5 +1,5 @@
 name: redmine
-version: 1.2.5
+version: 1.2.6
 appVersion: 3.4.2
 description: A flexible project management web application.
 keywords:
diff --git a/stable/redmine/templates/pvc.yaml b/stable/redmine/templates/pvc.yaml
index 0136362a7c..439abccbaf 100644
--- a/stable/redmine/templates/pvc.yaml
+++ b/stable/redmine/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/redmine/values.yaml b/stable/redmine/values.yaml
index b7d4ecf2cc..c769f6a68c 100644
--- a/stable/redmine/values.yaml
+++ b/stable/redmine/values.yaml
@@ -64,10 +64,14 @@ mariadb:
     ## If defined, PVC must be created manually before volume will be bound
     # existingClaim:
 
-    ## 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
 
@@ -90,10 +94,14 @@ postgresql:
     ## If defined, PVC must be created manually before volume will be bound
     # existingClaim:
 
-    ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
-    ## Default: volume.alpha.kubernetes.io/storage-class: default
+    ## postgresql 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
 
@@ -132,9 +140,13 @@ persistence:
   ## If defined, PVC must be created manually before volume will be bound
   # existingClaim:
 
-  ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
-  ## Default: volume.alpha.kubernetes.io/storage-class: default
+  ## redmine 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