Skip to content

Commit f360b76

Browse files
committed
test: disable useDataPlaneAPI in e2e tests
1 parent e005c99 commit f360b76

File tree

5 files changed

+8
-23
lines changed

5 files changed

+8
-23
lines changed

deploy/example/storageclass-blob-nfs.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ metadata:
66
provisioner: blob.csi.azure.com
77
parameters:
88
protocol: nfs
9-
useDataPlaneAPI: "false"
109
volumeBindingMode: Immediate
1110
allowVolumeExpansion: true
1211
mountOptions:

deploy/example/storageclass-blobfuse.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ metadata:
66
provisioner: blob.csi.azure.com
77
parameters:
88
skuName: Premium_LRS # available values: Standard_LRS, Premium_LRS, Standard_GRS, Standard_RAGRS, Standard_ZRS, Premium_ZRS
9-
useDataPlaneAPI: "false"
109
reclaimPolicy: Delete
1110
volumeBindingMode: Immediate
1211
allowVolumeExpansion: true

deploy/example/storageclass-blobfuse2.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ provisioner: blob.csi.azure.com
77
parameters:
88
skuName: Premium_LRS # available values: Standard_LRS, Premium_LRS, Standard_GRS, Standard_RAGRS, Standard_ZRS, Premium_ZRS
99
protocol: fuse2
10-
useDataPlaneAPI: "false"
1110
reclaimPolicy: Delete
1211
volumeBindingMode: Immediate
1312
allowVolumeExpansion: true

test/e2e/dynamic_provisioning_test.go

+8-16
Original file line numberDiff line numberDiff line change
@@ -962,7 +962,6 @@ var _ = ginkgo.Describe("[blob-csi-e2e] Dynamic Provisioning", func() {
962962
Pod: pod,
963963
PodWithClonedVolume: podWithClonedVolume,
964964
StorageClassParameters: map[string]string{
965-
"useDataPlaneAPI": "true",
966965
"skuName": "Premium_LRS",
967966
"protocol": "nfs",
968967
"mountPermissions": "0755",
@@ -995,7 +994,6 @@ var _ = ginkgo.Describe("[blob-csi-e2e] Dynamic Provisioning", func() {
995994
Pod: pod,
996995
PodWithClonedVolume: podWithClonedVolume,
997996
StorageClassParameters: map[string]string{
998-
"useDataPlaneAPI": "true",
999997
"skuName": "Premium_LRS",
1000998
"protocol": "nfs",
1001999
"mountPermissions": "0755",
@@ -1029,9 +1027,8 @@ var _ = ginkgo.Describe("[blob-csi-e2e] Dynamic Provisioning", func() {
10291027
Pod: pod,
10301028
PodWithClonedVolume: podWithClonedVolume,
10311029
StorageClassParameters: map[string]string{
1032-
"useDataPlaneAPI": "true",
1033-
"skuName": "Standard_LRS",
1034-
"protocol": "fuse2",
1030+
"skuName": "Standard_LRS",
1031+
"protocol": "fuse2",
10351032
},
10361033
}
10371034
test.Run(ctx, cs, ns)
@@ -1062,9 +1059,8 @@ var _ = ginkgo.Describe("[blob-csi-e2e] Dynamic Provisioning", func() {
10621059
Pod: pod,
10631060
PodWithClonedVolume: podWithClonedVolume,
10641061
StorageClassParameters: map[string]string{
1065-
"useDataPlaneAPI": "true",
1066-
"skuName": "Standard_LRS",
1067-
"protocol": "fuse2",
1062+
"skuName": "Standard_LRS",
1063+
"protocol": "fuse2",
10681064
},
10691065
}
10701066
test.Run(ctx, cs, ns)
@@ -1094,14 +1090,12 @@ var _ = ginkgo.Describe("[blob-csi-e2e] Dynamic Provisioning", func() {
10941090
Pod: pod,
10951091
PodWithClonedVolume: podWithClonedVolume,
10961092
StorageClassParameters: map[string]string{
1097-
"useDataPlaneAPI": "true",
10981093
"skuName": "Premium_LRS",
10991094
"protocol": "nfs",
11001095
"mountPermissions": "0755",
11011096
"allowsharedkeyaccess": "true",
11021097
},
11031098
ClonedStorageClassParameters: map[string]string{
1104-
"useDataPlaneAPI": "true",
11051099
"skuName": "Standard_LRS",
11061100
"protocol": "nfs",
11071101
"mountPermissions": "0755",
@@ -1136,14 +1130,12 @@ var _ = ginkgo.Describe("[blob-csi-e2e] Dynamic Provisioning", func() {
11361130
Pod: pod,
11371131
PodWithClonedVolume: podWithClonedVolume,
11381132
StorageClassParameters: map[string]string{
1139-
"useDataPlaneAPI": "true",
1140-
"skuName": "Standard_LRS",
1141-
"protocol": "fuse2",
1133+
"skuName": "Standard_LRS",
1134+
"protocol": "fuse2",
11421135
},
11431136
ClonedStorageClassParameters: map[string]string{
1144-
"useDataPlaneAPI": "true",
1145-
"skuName": "Premium_LRS",
1146-
"protocol": "fuse2",
1137+
"skuName": "Premium_LRS",
1138+
"protocol": "fuse2",
11471139
},
11481140
}
11491141
test.Run(ctx, cs, ns)

test/external-e2e/run.sh

-4
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ setup_e2e_binaries() {
3434
sed -i "s/blob.csi.azure.com/$DRIVER.csi.azure.com/g" deploy/example/storageclass-blobfuse.yaml
3535
sed -i "s/blob.csi.azure.com/$DRIVER.csi.azure.com/g" deploy/example/storageclass-blobfuse2.yaml
3636
sed -i "s/blob.csi.azure.com/$DRIVER.csi.azure.com/g" deploy/example/storageclass-blob-nfs.yaml
37-
# workaround: use useDataPlaneAPI as true for blobfuse and nfs copy volume tests
38-
sed -i "s/\"false\"/\"true\"/g" deploy/example/storageclass-blobfuse.yaml
39-
sed -i "s/\"false\"/\"true\"/g" deploy/example/storageclass-blobfuse2.yaml
40-
sed -i "s/\"false\"/\"true\"/g" deploy/example/storageclass-blob-nfs.yaml
4137

4238
make e2e-bootstrap
4339
sed -i "s/csi-blob-controller/csi-$DRIVER-controller/g" deploy/example/metrics/csi-blob-controller-svc.yaml

0 commit comments

Comments
 (0)