[stable/mongodb-replicaset] Use storageClassName for mongodb-replicaset.

helm · Sep 6, 2017 · c3328db · c3328db
1 parent 53c347e
commit c3328db
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/stable/mongodb-replicaset/Chart.yaml b/stable/mongodb-replicaset/Chart.yaml
@@ -1,6 +1,6 @@
 name: mongodb-replicaset
 home: https://github.com/mongodb/mongo
-version: 1.4.0
+version: 1.4.1
 description: NoSQL document-oriented database that stores JSON-like documents with dynamic schemas, simplifying the integration of data in content-driven applications.
 icon: https://webassets.mongodb.com/_com_assets/cms/mongodb-logo-rgb-j6w271g1xn.jpg
 sources:

diff --git a/stable/mongodb-replicaset/templates/mongodb-statefulset.yaml b/stable/mongodb-replicaset/templates/mongodb-statefulset.yaml
@@ -166,11 +166,6 @@ spec:
     - metadata:
         name: datadir
         annotations:
-        {{- if .Values.persistentVolume.storageClass | quote }}
-          volume.beta.kubernetes.io/storage-class: {{ .Values.persistentVolume.storageClass | quote }}
-        {{- else }}
-          volume.alpha.kubernetes.io/storage-class: default
-        {{- end }}
         {{- range $key, $value := .Values.persistentVolume.annotations }}
           {{ $key }}: {{ $value }}
         {{- end }}
@@ -182,6 +177,13 @@ spec:
         resources:
           requests:
             storage: {{ .Values.persistentVolume.size | quote }}
+      {{- if .Values.persistentVolume.storageClass }}
+      {{- if (eq "-" .Values.persistentVolume.storageClass) }}
+        storageClassName: ""
+      {{- else }}
+        storageClassName: "{{ .Values.persistentVolume.storageClass }}"
+      {{- end }}
+      {{- end }}
 {{- else }}
         - name: datadir
           emptyDir: {}

diff --git a/stable/mongodb-replicaset/values.yaml b/stable/mongodb-replicaset/values.yaml
@@ -37,10 +37,14 @@ resources: {}
 
 persistentVolume:
   enabled: true
-  ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
-  ## Default: volume.alpha.kubernetes.io/storage-class: default
+  ## mongodb-replicaset 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: fast
+  # storageClass: "-"
   accessModes:
     - ReadWriteOnce
   size: 10Gi