Merge pull request ceph#392 from red-hat-storage/sync_us--devel

Syncing latest changes from upstream devel for ceph-csi

scripts/k8s-storage/driver-rbd-rwo.yaml

@@ -6,7 +6,7 @@ StorageClass:
 
 SnapshotClass:
   # Must be set to enable snapshotting tests
-  FromName: true
+  FromExistingClassName: k8s-storage-e2e-rbd
 
 DriverInfo:
   # Internal name of the driver, display name in the test case and test objects
@@ -51,7 +51,7 @@ DriverInfo:
     volumeLimits: false
 
     # Support for volume expansion in controllers
-    controllerExpansion: false
+    controllerExpansion: true
 
     # Support for volume expansion in nodes
     nodeExpansion: true
@@ -66,7 +66,7 @@ DriverInfo:
     topology: false
 
     # Support populate data from snapshot
-    snapshotDataSource: false
+    snapshotDataSource: true
 
     # Support populated data from PVC
-    pvcDataSource: false
+    pvcDataSource: true

scripts/k8s-storage/volumesnapshotclass-rbd.yaml.in

@@ -0,0 +1,11 @@
+---
+apiVersion: snapshot.storage.k8s.io/v1
+kind: VolumeSnapshotClass
+metadata:
+  name: k8s-storage-e2e-rbd
+driver: rbd.csi.ceph.com
+parameters:
+  clusterID: @@CLUSTER_ID@@
+  csi.storage.k8s.io/snapshotter-secret-name: rook-csi-rbd-provisioner
+  csi.storage.k8s.io/snapshotter-secret-namespace: rook-ceph
+deletionPolicy: Delete