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

k8s-ci-robot · web-flow · commit 9291a0818550 · 2025-09-12T20:26:07.000-07:00
[release-1.32] test: add v2 file share e2e test
diff --git a/pkg/azurefile/controllerserver.go b/pkg/azurefile/controllerserver.go
@@ -413,10 +413,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
@@ -526,7 +526,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
`@@ -413,10 +413,12 @@ func (d Driver) CreateVolume(ctx context.Context, req csi.CreateVolumeRequest)`
`413`	`413`	`accountKind = string(armstorage.KindFileStorage)`
`414`	`414`	`if strings.Contains(strings.ToLower(sku), "v2") {`
`415`	`415`	`if fileShareSize < minimumPremiumV2ShareSize {`
	`416`	`+ klog.V(2).Infof("fileShareSize(%d) is less than minimumPremiumV2ShareSize(%d), using minimumPremiumV2ShareSize", fileShareSize, minimumPremiumV2ShareSize)`
`416`	`417`	`fileShareSize = minimumPremiumV2ShareSize`
`417`	`418`	`}`
`418`	`419`	`} else {`
`419`	`420`	`if fileShareSize < minimumPremiumShareSize {`
	`421`	`+ klog.V(2).Infof("fileShareSize(%d) is less than minimumPremiumShareSize(%d), using minimumPremiumShareSize", fileShareSize, minimumPremiumShareSize)`
`420`	`422`	`fileShareSize = minimumPremiumShareSize`
`421`	`423`	`}`
`422`	`424`	`}`
Original file line number	Diff line number	Diff line change
`@@ -526,7 +526,7 @@ var _ = ginkgo.Describe("Dynamic Provisioning", func() {`
`526`	`526`	`Volumes: volumes,`
`527`	`527`	`Azurefile: azurefileDriver,`
`528`	`528`	`StorageClassParameters: map[string]string{`
`529`		`- "skuName": "Premium_LRS",`
	`529`	`+ "skuName": "PremiumV2_LRS",`
`530`	`530`	`},`
`531`	`531`	`}`
`532`	`532`	`test.Run(ctx, cs, ns)`