Merge pull request #2029 from k8s-infra-cherrypick-robot/cherry-pick-2027-to-release-1.29

andyzhangx · web-flow · commit 1c37e986c704 · 2024-08-05T23:31:15.000+08:00
[release-1.29] fix: only last subnet is set in account ACL created by driver
diff --git a/pkg/azurefile/controllerserver.go b/pkg/azurefile/controllerserver.go
@@ -366,7 +366,7 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 				subnet = strings.TrimSpace(subnet)
 				vnetResourceID := d.getSubnetResourceID(vnetResourceGroup, vnetName, subnet)
 				klog.V(2).Infof("set vnetResourceID(%s) for NFS protocol", vnetResourceID)
-				vnetResourceIDs = []string{vnetResourceID}
+				vnetResourceIDs = append(vnetResourceIDs, vnetResourceID)
 				if err := d.updateSubnetServiceEndpoints(ctx, vnetResourceGroup, vnetName, subnet); err != nil {
 					return nil, status.Errorf(codes.Internal, "update service endpoints failed with error: %v", err)
 				}

Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ func (d Driver) CreateVolume(ctx context.Context, req csi.CreateVolumeRequest)`
`366`	`366`	`subnet = strings.TrimSpace(subnet)`
`367`	`367`	`vnetResourceID := d.getSubnetResourceID(vnetResourceGroup, vnetName, subnet)`
`368`	`368`	`klog.V(2).Infof("set vnetResourceID(%s) for NFS protocol", vnetResourceID)`
`369`		`- vnetResourceIDs = []string{vnetResourceID}`
	`369`	`+ vnetResourceIDs = append(vnetResourceIDs, vnetResourceID)`
`370`	`370`	`if err := d.updateSubnetServiceEndpoints(ctx, vnetResourceGroup, vnetName, subnet); err != nil {`
`371`	`371`	`return nil, status.Errorf(codes.Internal, "update service endpoints failed with error: %v", err)`
`372`	`372`	`}`