Merge pull request #2766 from k8s-infra-cherrypick-robot/cherry-pick-2765-to-release-1.33

k8s-ci-robot · web-flow · commit 70093df3b976 · 2025-09-12T07:28:10.000-07:00
[release-1.33] test: add v2 file share e2e test
diff --git a/pkg/azurefile/controllerserver.go b/pkg/azurefile/controllerserver.go
@@ -439,10 +439,12 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 		accountKind = string(armstorage.KindFileStorage)
 		if strings.Contains(strings.ToLower(sku), "v2") {
 			if fileShareSize < minimumPremiumV2ShareSize {
+				klog.V(2).Infof("fileShareSize(%d) is less than minimumPremiumV2ShareSize(%d), using minimumPremiumV2ShareSize", fileShareSize, minimumPremiumV2ShareSize)
 				fileShareSize = minimumPremiumV2ShareSize
 			}
 		} else {
 			if fileShareSize < minimumPremiumShareSize {
+				klog.V(2).Infof("fileShareSize(%d) is less than minimumPremiumShareSize(%d), using minimumPremiumShareSize", fileShareSize, minimumPremiumShareSize)
 				fileShareSize = minimumPremiumShareSize
 			}
 		}
diff --git a/test/e2e/dynamic_provisioning_test.go b/test/e2e/dynamic_provisioning_test.go
@@ -561,7 +561,7 @@ var _ = ginkgo.Describe("Dynamic Provisioning", func() {
 			Volumes:   volumes,
 			Azurefile: azurefileDriver,
 			StorageClassParameters: map[string]string{
-				"skuName": "Premium_LRS",
+				"skuName": "PremiumV2_LRS",
 			},
 		}
 		test.Run(ctx, cs, ns)

Original file line number	Diff line number	Diff line change
`@@ -439,10 +439,12 @@ func (d Driver) CreateVolume(ctx context.Context, req csi.CreateVolumeRequest)`
`439`	`439`	`accountKind = string(armstorage.KindFileStorage)`
`440`	`440`	`if strings.Contains(strings.ToLower(sku), "v2") {`
`441`	`441`	`if fileShareSize < minimumPremiumV2ShareSize {`
	`442`	`+ klog.V(2).Infof("fileShareSize(%d) is less than minimumPremiumV2ShareSize(%d), using minimumPremiumV2ShareSize", fileShareSize, minimumPremiumV2ShareSize)`
`442`	`443`	`fileShareSize = minimumPremiumV2ShareSize`
`443`	`444`	`}`
`444`	`445`	`} else {`
`445`	`446`	`if fileShareSize < minimumPremiumShareSize {`
	`447`	`+ klog.V(2).Infof("fileShareSize(%d) is less than minimumPremiumShareSize(%d), using minimumPremiumShareSize", fileShareSize, minimumPremiumShareSize)`
`446`	`448`	`fileShareSize = minimumPremiumShareSize`
`447`	`449`	`}`
`448`	`450`	`}`
Original file line number	Diff line number	Diff line change
`@@ -561,7 +561,7 @@ var _ = ginkgo.Describe("Dynamic Provisioning", func() {`
`561`	`561`	`Volumes: volumes,`
`562`	`562`	`Azurefile: azurefileDriver,`
`563`	`563`	`StorageClassParameters: map[string]string{`
`564`		`- "skuName": "Premium_LRS",`
	`564`	`+ "skuName": "PremiumV2_LRS",`
`565`	`565`	`},`
`566`	`566`	`}`
`567`	`567`	`test.Run(ctx, cs, ns)`