Merge remote-tracking branch 'upstream/master' into discover-snapshots

ashish-amarnath · ashish-amarnath · commit 25b7ca5dc8a7 · 2020-03-05T16:35:06.000-08:00
diff --git a/deploy/kubernetes-1.15/test-driver.yaml b/deploy/kubernetes-1.15/test-driver.yaml
@@ -4,8 +4,6 @@
 
 StorageClass:
   FromName: true
-SnapshotClass:
-  FromName: true
 DriverInfo:
   Name: hostpath.csi.k8s.io
   Capabilities:
diff --git a/deploy/kubernetes-1.16/test-driver.yaml b/deploy/kubernetes-1.16/test-driver.yaml
@@ -4,8 +4,6 @@
 
 StorageClass:
   FromName: true
-SnapshotClass:
-  FromName: true
 DriverInfo:
   Name: hostpath.csi.k8s.io
   Capabilities:
@@ -15,4 +13,3 @@ DriverInfo:
     multipods: true
     nodeExpansion: true
     persistence: true
-    snapshotDataSource: true
