Merge pull request #2416 from k8s-infra-cherrypick-robot/cherry-pick-2142-to-release-1.31

andyzhangx · web-flow · commit 7dbdf72249c5 · 2025-03-07T12:00:53.000+08:00
[release-1.31] feat: support Provisioned v2 Azure File share sku
diff --git a/pkg/azurefile/controllerserver.go b/pkg/azurefile/controllerserver.go
@@ -401,6 +401,11 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 		}
 	}
 
+	// use v2 account kind for v2 sku
+	if strings.Contains(strings.ToLower(sku), "v2") {
+		accountKind = string(armstorage.KindFileStorage)
+	}
+
 	// replace pv/pvc name namespace metadata in fileShareName
 	validFileShareName := replaceWithMap(fileShareName, fileShareNameReplaceMap)
 	if validFileShareName == "" {

Original file line number	Diff line number	Diff line change
`@@ -401,6 +401,11 @@ func (d Driver) CreateVolume(ctx context.Context, req csi.CreateVolumeRequest)`
`401`	`401`	`}`
`402`	`402`	`}`
`403`	`403`
	`404`	`+ // use v2 account kind for v2 sku`
	`405`	`+ if strings.Contains(strings.ToLower(sku), "v2") {`
	`406`	`+ accountKind = string(armstorage.KindFileStorage)`
	`407`	`+ }`
	`408`	`+`
`404`	`409`	`// replace pv/pvc name namespace metadata in fileShareName`
`405`	`410`	`validFileShareName := replaceWithMap(fileShareName, fileShareNameReplaceMap)`
`406`	`411`	`if validFileShareName == "" {`