Merge pull request #1536 from k8s-infra-cherrypick-robot/cherry-pick-1534-to-release-1.23

k8s-ci-robot · web-flow · commit 04066ca46809 · 2024-08-04T20:04:38.000-07:00
[release-1.23] fix: only last subnet is set in account ACL created by driver
diff --git a/pkg/blob/controllerserver.go b/pkg/blob/controllerserver.go
@@ -272,7 +272,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
`@@ -272,7 +272,7 @@ func (d Driver) CreateVolume(ctx context.Context, req csi.CreateVolumeRequest)`
`272`	`272`	`subnet = strings.TrimSpace(subnet)`
`273`	`273`	`vnetResourceID := d.getSubnetResourceID(vnetResourceGroup, vnetName, subnet)`
`274`	`274`	`klog.V(2).Infof("set vnetResourceID(%s) for NFS protocol", vnetResourceID)`
`275`		`- vnetResourceIDs = []string{vnetResourceID}`
	`275`	`+ vnetResourceIDs = append(vnetResourceIDs, vnetResourceID)`
`276`	`276`	`if err := d.updateSubnetServiceEndpoints(ctx, vnetResourceGroup, vnetName, subnet); err != nil {`
`277`	`277`	`return nil, status.Errorf(codes.Internal, "update service endpoints failed with error: %v", err)`
`278`	`278`	`}`