Remove storage-class annotations in examples

cluster/juju/layers/kubernetes-master/templates/rbd-persistent-volume.yaml

@@ -4,13 +4,12 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: {{ RBD_NAME }}
-  annotations:
-    volume.beta.kubernetes.io/storage-class: "rbd"
 spec:
   capacity:
     storage: {{ RBD_SIZE }}M
   accessModes:
     - {{ PV_MODE }}
+  storageClassName: "rbd"
   rbd:
     monitors:
       {% for host in monitors %}

examples/cockroachdb/cockroachdb-statefulset.yaml

@@ -163,8 +163,6 @@ spec:
   volumeClaimTemplates:
   - metadata:
       name: datadir
-      annotations:
-        volume.alpha.kubernetes.io/storage-class: anything
     spec:
       accessModes:
         - "ReadWriteOnce"

examples/storage/cassandra/cassandra-statefulset.yaml

@@ -82,13 +82,12 @@ spec:
   volumeClaimTemplates:
   - metadata:
       name: cassandra-data
-      annotations:
-        volume.beta.kubernetes.io/storage-class: fast
     spec:
       accessModes: [ "ReadWriteOnce" ]
       resources:
         requests:
           storage: 1Gi
+      storageClassName: fast
 ---
 kind: StorageClass
 apiVersion: storage.k8s.io/v1beta1

examples/storage/minio/minio-distributed-statefulset.yaml

@@ -39,8 +39,6 @@ spec:
   volumeClaimTemplates:
   - metadata:
       name: data
-      annotations:
-        volume.alpha.kubernetes.io/storage-class: anything
     spec:
       accessModes:
         - ReadWriteOnce

examples/storage/minio/minio-standalone-pvc.yaml

@@ -3,8 +3,6 @@ kind: PersistentVolumeClaim
 metadata:
   # This name uniquely identifies the PVC. Will be used in deployment below.
   name: minio-pv-claim
-  annotations:
-    volume.alpha.kubernetes.io/storage-class: anything
   labels:
     app: minio-storage-claim
 spec:

examples/volumes/nfs/provisioner/nfs-server-gce-pv.yaml

@@ -4,8 +4,6 @@ metadata:
   name: nfs-pv-provisioning-demo
   labels:
     demo: nfs-pv-provisioning
-  annotations:
-    volume.alpha.kubernetes.io/storage-class: any
 spec:
   accessModes: [ "ReadWriteOnce" ]
   resources:

examples/volumes/portworx/portworx-volume-pvcsc.yaml

@@ -2,11 +2,10 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: pvcsc001
-  annotations:
-    volume.beta.kubernetes.io/storage-class: portworx-io-priority-high
 spec:
   accessModes:
     - ReadWriteOnce
   resources:
     requests:
       storage: 2Gi
+  storageClassName: portworx-io-priority-high

examples/volumes/scaleio/sc-pvc.yaml

@@ -2,11 +2,10 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: pvc-sio-small
-  annotations:
-      volume.beta.kubernetes.io/storage-class: sio-small
 spec:
   accessModes:
     - ReadWriteOnce
   resources:
     requests:
       storage: 10Gi
+  storageClassName: sio-small

examples/volumes/vsphere/simple-statefulset.yaml

@@ -37,10 +37,9 @@ spec:
   volumeClaimTemplates:
   - metadata:
       name: www
-      annotations:
-        volume.beta.kubernetes.io/storage-class: thin-disk
     spec:
       accessModes: [ "ReadWriteOnce" ]
       resources:
         requests:
           storage: 1Gi
+      storageClassName: thin-disk

examples/volumes/vsphere/vsphere-volume-pvcsc.yaml

@@ -2,11 +2,10 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: pvcsc001
-  annotations:
-    volume.beta.kubernetes.io/storage-class: fast
 spec:
   accessModes:
     - ReadWriteOnce
   resources:
     requests:
       storage: 2Gi
+  storageClassName: fast

test/e2e/framework/statefulset_utils.go

@@ -751,9 +751,6 @@ func NewStatefulSetPVC(name string) v1.PersistentVolumeClaim {
 	return v1.PersistentVolumeClaim{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: name,
-			Annotations: map[string]string{
-				"volume.alpha.kubernetes.io/storage-class": "anything",
-			},
 		},
 		Spec: v1.PersistentVolumeClaimSpec{
 			AccessModes: []v1.PersistentVolumeAccessMode{

test/e2e/testing-manifests/statefulset/cockroachdb/statefulset.yaml

@@ -92,8 +92,6 @@ spec:
   volumeClaimTemplates:
   - metadata:
       name: datadir
-      annotations:
-        volume.alpha.kubernetes.io/storage-class: anything
     spec:
       accessModes:
         - "ReadWriteOnce"

test/e2e/testing-manifests/statefulset/etcd/statefulset.yaml

@@ -166,8 +166,6 @@ spec:
   volumeClaimTemplates:
   - metadata:
       name: datadir
-      annotations:
-        volume.alpha.kubernetes.io/storage-class: anything
     spec:
       accessModes:
         - "ReadWriteOnce"
@@ -175,4 +173,3 @@ spec:
         requests:
           # upstream recommended max is 700M
           storage: 1Gi
-

test/e2e/testing-manifests/statefulset/mysql-galera/statefulset.yaml

@@ -77,8 +77,6 @@ spec:
   volumeClaimTemplates:
   - metadata:
       name: datadir
-      annotations:
-        volume.alpha.kubernetes.io/storage-class: anything
     spec:
       accessModes: [ "ReadWriteOnce" ]
       resources:

test/e2e/testing-manifests/statefulset/redis/statefulset.yaml

@@ -71,8 +71,6 @@ spec:
   volumeClaimTemplates:
   - metadata:
       name: datadir
-      annotations:
-        volume.alpha.kubernetes.io/storage-class: anything
     spec:
       accessModes: [ "ReadWriteOnce" ]
       resources:

test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml

@@ -78,8 +78,6 @@ spec:
   volumeClaimTemplates:
   - metadata:
       name: datadir
-      annotations:
-        volume.alpha.kubernetes.io/storage-class: anything
     spec:
       accessModes: [ "ReadWriteOnce" ]
       resources: