From f9252a823524f112947e2513ebb92ac5b872a3a5 Mon Sep 17 00:00:00 2001
From: Chris Wedgwood <cw@f00f.org>
Date: Sat, 27 May 2017 05:12:25 +0000
Subject: [PATCH] Use storageClassName in preference to the annotation.

Change-Id: I60a2b607b85cd22abbd5b0d10c4571430f56d62f
---
 mariadb/templates/statefulset.yaml | 3 +--
 mariadb/values.yaml                | 1 -
 tests/pvc-test.yaml                | 3 +--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/mariadb/templates/statefulset.yaml b/mariadb/templates/statefulset.yaml
index 0311e7905c..9f8492d859 100644
--- a/mariadb/templates/statefulset.yaml
+++ b/mariadb/templates/statefulset.yaml
@@ -119,11 +119,10 @@ spec:
   volumeClaimTemplates:
   - metadata:
       name: mysql-data
-      annotations:
-        {{ .Values.volume.class_path }}: {{ .Values.volume.class_name }}
     spec:
       accessModes: [ "ReadWriteOnce" ]
       resources:
         requests:
           storage: {{ .Values.volume.size }}
+      storageClassName: {{ .Values.volume.class_name }}
 {{- end }}
diff --git a/mariadb/values.yaml b/mariadb/values.yaml
index eb8ae516e4..c94c5650cb 100644
--- a/mariadb/values.yaml
+++ b/mariadb/values.yaml
@@ -35,7 +35,6 @@ images:
 
 volume:
   enabled: true
-  class_path: volume.beta.kubernetes.io/storage-class
   class_name: general
   size: 2Gi
 
diff --git a/tests/pvc-test.yaml b/tests/pvc-test.yaml
index b750d9d2f5..475d995ece 100644
--- a/tests/pvc-test.yaml
+++ b/tests/pvc-test.yaml
@@ -17,11 +17,10 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: pvc-test
-  annotations:
-    volume.beta.kubernetes.io/storage-class: general
 spec:
   accessModes:
     - ReadWriteOnce
   resources:
     requests:
       storage: 1Gi
+  storageClassName: general