From 9917fcaaca0264ecbebc0293132f44af11e69170 Mon Sep 17 00:00:00 2001
From: Michael Goodness <mgoodness@widen.com>
Date: Mon, 21 Nov 2016 11:59:49 -0600
Subject: [PATCH] Default PVC SC is alpha:default

---
 stable/prometheus/README.md                       | 2 ++
 stable/prometheus/templates/alertmanager-pvc.yaml | 2 +-
 stable/prometheus/templates/server-pvc.yaml       | 2 +-
 stable/prometheus/values.yaml                     | 4 ++++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/stable/prometheus/README.md b/stable/prometheus/README.md
index be5e9451b4..037d9eb490 100644
--- a/stable/prometheus/README.md
+++ b/stable/prometheus/README.md
@@ -55,6 +55,7 @@ The following tables lists the configurable parameters of the Spartakus chart an
 | `alertmanager.persistentVolume.enabled` | If true, AlertManager will create a Persistent Volume Claim | `true` |
 | `alertmanager.persistentVolume.accessModes` | AlertManager data Persistent Volume access modes | `[ReadWriteOnce]` |
 | `alertmanager.persistentVolume.size` | AlertManager data Persistent Volume size | `2Gi` |
+| `server.persistentVolume.storageClass` | AlertManager data Persistent Volume Storage Class | `volume.alpha.kubernetes.io/storage-class: default` |
 | `alertmanager.resources` | Alertmanager resource requests and limits (YAML) |`requests: {cpu: 10m, memory: 32Mi}` |
 | `alertmanager.serviceType` | Alertmanager service type | `ClusterIP` |
 | `alertmanager.storagePath` | Alertmanager data storage path | `/data` |
@@ -75,6 +76,7 @@ The following tables lists the configurable parameters of the Spartakus chart an
 | `server.persistentVolume.accessModes` | Server data Persistent Volume access modes | `[ReadWriteOnce]` |
 | `server.persistentVolume.annotations` | Server data Persistent Volume annotations | `[]` |
 | `server.persistentVolume.size` | Server data Persistent Volume size | `8Gi` |
+| `server.persistentVolume.storageClass` | Server data Persistent Volume Storage Class | `volume.alpha.kubernetes.io/storage-class: default` |
 | `server.resources` | Server resource requests and limits | `requests: {cpu: 500m, memory: 512Mi}` |
 | `server.serviceType` | Server service type | `ClusterIP` |
 | `server.storageLocalPath` | Server local data storage path | `/data` |
diff --git a/stable/prometheus/templates/alertmanager-pvc.yaml b/stable/prometheus/templates/alertmanager-pvc.yaml
index 22c259a269..b7657a410f 100644
--- a/stable/prometheus/templates/alertmanager-pvc.yaml
+++ b/stable/prometheus/templates/alertmanager-pvc.yaml
@@ -6,7 +6,7 @@ metadata:
   {{- if .Values.alertmanager.persistentVolume.storageClass -}}
     volume.beta.kubernetes.io/storage-class: {{ .Values.alertmanager.persistentVolume.storageClass }}
   {{ else }}
-    volume.alpha.kubernetes.io/storage-class: ''
+    volume.alpha.kubernetes.io/storage-class: default
   {{- end }}
   {{- range $key, $value := .Values.alertmanager.persistentVolume.annotations }}
     {{ $key }}: {{ $value }}
diff --git a/stable/prometheus/templates/server-pvc.yaml b/stable/prometheus/templates/server-pvc.yaml
index ffaffb1deb..9420dbce57 100644
--- a/stable/prometheus/templates/server-pvc.yaml
+++ b/stable/prometheus/templates/server-pvc.yaml
@@ -6,7 +6,7 @@ metadata:
   {{- if .Values.server.persistentVolume.storageClass -}}
     volume.beta.kubernetes.io/storage-class: {{ .Values.server.persistentVolume.storageClass }}
   {{ else }}
-    volume.alpha.kubernetes.io/storage-class: ''
+    volume.alpha.kubernetes.io/storage-class: default
   {{- end }}
   {{- range $key, $value := .Values.server.persistentVolume.annotations }}
     {{ $key }}: {{ $value }}
diff --git a/stable/prometheus/values.yaml b/stable/prometheus/values.yaml
index d2bb5f3d51..100a71c68d 100644
--- a/stable/prometheus/values.yaml
+++ b/stable/prometheus/values.yaml
@@ -63,6 +63,8 @@ alertmanager:
     size: 2Gi
 
     ## AlertManager data Persistent Volume Storage Class
+    ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
+    ## Default: volume.alpha.kubernetes.io/storage-class: default
     ##
     # storageClass:
 
@@ -178,6 +180,8 @@ server:
     size: 8Gi
 
     ## AlertManager data Persistent Volume Storage Class
+    ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
+    ## Default: volume.alpha.kubernetes.io/storage-class: default
     ##
     # storageClass: