diff --git a/deploy/example/storageclass-blob-nfs.yaml b/deploy/example/storageclass-blob-nfs.yaml index 5492327cf..83fa83486 100644 --- a/deploy/example/storageclass-blob-nfs.yaml +++ b/deploy/example/storageclass-blob-nfs.yaml @@ -6,6 +6,7 @@ metadata: provisioner: blob.csi.azure.com parameters: protocol: nfs + useDataPlaneAPI: "false" volumeBindingMode: Immediate allowVolumeExpansion: true mountOptions: diff --git a/deploy/example/storageclass-blobfuse.yaml b/deploy/example/storageclass-blobfuse.yaml index bfdb62654..5b6b0b352 100644 --- a/deploy/example/storageclass-blobfuse.yaml +++ b/deploy/example/storageclass-blobfuse.yaml @@ -6,6 +6,7 @@ metadata: provisioner: blob.csi.azure.com parameters: skuName: Premium_LRS # available values: Standard_LRS, Premium_LRS, Standard_GRS, Standard_RAGRS, Standard_ZRS, Premium_ZRS + useDataPlaneAPI: "false" reclaimPolicy: Delete volumeBindingMode: Immediate allowVolumeExpansion: true diff --git a/test/e2e/dynamic_provisioning_test.go b/test/e2e/dynamic_provisioning_test.go index 3544368cb..dcc3c8572 100644 --- a/test/e2e/dynamic_provisioning_test.go +++ b/test/e2e/dynamic_provisioning_test.go @@ -962,6 +962,7 @@ var _ = ginkgo.Describe("[blob-csi-e2e] Dynamic Provisioning", func() { Pod: pod, PodWithClonedVolume: podWithClonedVolume, StorageClassParameters: map[string]string{ + "useDataPlaneAPI": "true", "skuName": "Premium_LRS", "protocol": "nfs", "mountPermissions": "0755", @@ -994,6 +995,7 @@ var _ = ginkgo.Describe("[blob-csi-e2e] Dynamic Provisioning", func() { Pod: pod, PodWithClonedVolume: podWithClonedVolume, StorageClassParameters: map[string]string{ + "useDataPlaneAPI": "true", "skuName": "Premium_LRS", "protocol": "nfs", "mountPermissions": "0755", @@ -1027,8 +1029,9 @@ var _ = ginkgo.Describe("[blob-csi-e2e] Dynamic Provisioning", func() { Pod: pod, PodWithClonedVolume: podWithClonedVolume, StorageClassParameters: map[string]string{ - "skuName": "Standard_LRS", - "protocol": "fuse2", + "useDataPlaneAPI": "true", + "skuName": "Standard_LRS", + "protocol": "fuse2", }, } test.Run(ctx, cs, ns) @@ -1059,8 +1062,9 @@ var _ = ginkgo.Describe("[blob-csi-e2e] Dynamic Provisioning", func() { Pod: pod, PodWithClonedVolume: podWithClonedVolume, StorageClassParameters: map[string]string{ - "skuName": "Standard_LRS", - "protocol": "fuse2", + "useDataPlaneAPI": "true", + "skuName": "Standard_LRS", + "protocol": "fuse2", }, } test.Run(ctx, cs, ns) @@ -1090,12 +1094,14 @@ var _ = ginkgo.Describe("[blob-csi-e2e] Dynamic Provisioning", func() { Pod: pod, PodWithClonedVolume: podWithClonedVolume, StorageClassParameters: map[string]string{ + "useDataPlaneAPI": "true", "skuName": "Premium_LRS", "protocol": "nfs", "mountPermissions": "0755", "allowsharedkeyaccess": "true", }, ClonedStorageClassParameters: map[string]string{ + "useDataPlaneAPI": "true", "skuName": "Standard_LRS", "protocol": "nfs", "mountPermissions": "0755", @@ -1130,12 +1136,14 @@ var _ = ginkgo.Describe("[blob-csi-e2e] Dynamic Provisioning", func() { Pod: pod, PodWithClonedVolume: podWithClonedVolume, StorageClassParameters: map[string]string{ - "skuName": "Standard_LRS", - "protocol": "fuse2", + "useDataPlaneAPI": "true", + "skuName": "Standard_LRS", + "protocol": "fuse2", }, ClonedStorageClassParameters: map[string]string{ - "skuName": "Premium_LRS", - "protocol": "fuse2", + "useDataPlaneAPI": "true", + "skuName": "Premium_LRS", + "protocol": "fuse2", }, } test.Run(ctx, cs, ns) diff --git a/test/external-e2e/run.sh b/test/external-e2e/run.sh index 31d132a4a..cbbf1779d 100755 --- a/test/external-e2e/run.sh +++ b/test/external-e2e/run.sh @@ -30,10 +30,15 @@ setup_e2e_binaries() { export EXTRA_HELM_OPTIONS=$EXTRA_HELM_OPTIONS" --set feature.fsGroupPolicy=File" fi - # test on alternative driver name + # test on alternative driver name sed -i "s/blob.csi.azure.com/$DRIVER.csi.azure.com/g" deploy/example/storageclass-blobfuse.yaml sed -i "s/blob.csi.azure.com/$DRIVER.csi.azure.com/g" deploy/example/storageclass-blobfuse2.yaml sed -i "s/blob.csi.azure.com/$DRIVER.csi.azure.com/g" deploy/example/storageclass-blob-nfs.yaml + # workaround: use useDataPlaneAPI as true for blobfuse and nfs copy volume tests + sed -i "s/\"false\"/\"true\"/g" deploy/example/storageclass-blobfuse.yaml + sed -i "s/\"false\"/\"true\"/g" deploy/example/storageclass-blobfuse2.yaml + sed -i "s/\"false\"/\"true\"/g" deploy/example/storageclass-blob-nfs.yaml + make e2e-bootstrap sed -i "s/csi-blob-controller/csi-$DRIVER-controller/g" deploy/example/metrics/csi-blob-controller-svc.yaml make create-metrics-svc