From f42038388241e4c534c7b71f4be551ba3fa5e522 Mon Sep 17 00:00:00 2001
From: Graham Rounds <gtrounds@gmail.com>
Date: Sat, 13 Jan 2018 00:24:44 -0800
Subject: [PATCH] Use storageClassName in Helm Charts (#444) (#445)

---
 charts/fission-all/templates/pvc.yaml  | 14 +++++++-------
 charts/fission-all/values.yaml         | 15 +++++++++------
 charts/fission-core/templates/pvc.yaml | 14 +++++++-------
 charts/fission-core/values.yaml        | 11 +++++++----
 4 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/charts/fission-all/templates/pvc.yaml b/charts/fission-all/templates/pvc.yaml
index d8c6aa51..7819c1db 100644
--- a/charts/fission-all/templates/pvc.yaml
+++ b/charts/fission-all/templates/pvc.yaml
@@ -7,17 +7,17 @@ metadata:
     app: fission-storage
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
-  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 | quote }}
+  {{- end }}
+  {{- end }}
 {{- end }}
diff --git a/charts/fission-all/values.yaml b/charts/fission-all/values.yaml
index eb371ca6..fbbe6054 100644
--- a/charts/fission-all/values.yaml
+++ b/charts/fission-all/values.yaml
@@ -1,6 +1,6 @@
 #
 # Fission chart configuration
-# 
+#
 
 ## Kubernetes configuration
 ## For minikube, set this to NodePort, elsewhere use LoadBalancer.
@@ -10,7 +10,7 @@ serviceType: LoadBalancer
 image: fission/fission-bundle
 
 ## Image pull policy
-pullPolicy: IfNotPresent 
+pullPolicy: IfNotPresent
 
 ## Fission image version
 imageTag: 0.4.0
@@ -48,15 +48,18 @@ logger:
 nats:
   authToken: "defaultFissionAuthToken"
   clusterID: "fissionMQTrigger"
-  
+
 
 ## Persist data to a persistent volume.
 persistence:
   enabled: true
-  ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
-  ## Default: volume.alpha.kubernetes.io/storage-class: default
+  ## 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
 
diff --git a/charts/fission-core/templates/pvc.yaml b/charts/fission-core/templates/pvc.yaml
index d8c6aa51..7819c1db 100644
--- a/charts/fission-core/templates/pvc.yaml
+++ b/charts/fission-core/templates/pvc.yaml
@@ -7,17 +7,17 @@ metadata:
     app: fission-storage
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
-  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 | quote }}
+  {{- end }}
+  {{- end }}
 {{- end }}
diff --git a/charts/fission-core/values.yaml b/charts/fission-core/values.yaml
index 8c7b73b0..0919c7ca 100644
--- a/charts/fission-core/values.yaml
+++ b/charts/fission-core/values.yaml
@@ -1,6 +1,6 @@
 #
 # Fission chart configuration
-# 
+#
 
 ## Kubernetes configuration
 ## For minikube, set this to NodePort, elsewhere use LoadBalancer.
@@ -38,10 +38,13 @@ builderNamespace: fission-builder
 ## Persist data to a persistent volume.
 persistence:
   enabled: true
-  ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
-  ## Default: volume.alpha.kubernetes.io/storage-class: default
+  ## 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