Use storageClassName in preference to the annotation.

Change-Id: I60a2b607b85cd22abbd5b0d10c4571430f56d62f

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 }}

mariadb/values.yaml

@@ -35,7 +35,6 @@ images:
 
 volume:
   enabled: true
-  class_path: volume.beta.kubernetes.io/storage-class
   class_name: general
   size: 2Gi
 

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