Merge pull request #2142 from kubernetes-sigs/upgrade-sa-api-version

andyzhangx · web-flow · commit ef8322c54161 · 2025-01-18T13:36:44.000+08:00
feat: support Provisioned v2 Azure File share sku
diff --git a/pkg/azurefile/controllerserver.go b/pkg/azurefile/controllerserver.go
@@ -404,6 +404,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
`@@ -404,6 +404,11 @@ func (d Driver) CreateVolume(ctx context.Context, req csi.CreateVolumeRequest)`
`404`	`404`	`}`
`405`	`405`	`}`
`406`	`406`
	`407`	`+ // use v2 account kind for v2 sku`
	`408`	`+ if strings.Contains(strings.ToLower(sku), "v2") {`
	`409`	`+ accountKind = string(armstorage.KindFileStorage)`
	`410`	`+ }`
	`411`	`+`
`407`	`412`	`// replace pv/pvc name namespace metadata in fileShareName`
`408`	`413`	`validFileShareName := replaceWithMap(fileShareName, fileShareNameReplaceMap)`
`409`	`414`	`if validFileShareName == "" {`