Skip to content

Commit 7f5ee23

Browse files
committed
fix: match account if PrivateEndpoint is not set in storage class
1 parent a3ba54f commit 7f5ee23

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

pkg/azurefile/controllerserver.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -314,9 +314,9 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
314314

315315
enableHTTPSTrafficOnly := true
316316
shareProtocol := storage.EnabledProtocolsSMB
317-
createPrivateEndpoint := false
317+
var createPrivateEndpoint *bool
318318
if strings.EqualFold(networkEndpointType, privateEndpoint) {
319-
createPrivateEndpoint = true
319+
createPrivateEndpoint = pointer.BoolPtr(true)
320320
}
321321
var vnetResourceIDs []string
322322
if fsType == nfs || protocol == nfs {
@@ -332,7 +332,7 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
332332
// reset protocol field (compatble with "fsType: nfs")
333333
setKeyValueInMap(parameters, protocolField, protocol)
334334

335-
if !createPrivateEndpoint {
335+
if !pointer.BoolDeref(createPrivateEndpoint, false) {
336336
// set VirtualNetworkResourceIDs for storage account firewall setting
337337
vnetResourceID := d.getSubnetResourceID(vnetResourceGroup, vnetName, subnetName)
338338
klog.V(2).Infof("set vnetResourceID(%s) for NFS protocol", vnetResourceID)
@@ -435,7 +435,7 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
435435
accountName = v.(string)
436436
} else {
437437
lockKey = fmt.Sprintf("%s%s%s%s%s%s%s%v%v%v%v%v", sku, accountKind, resourceGroup, location, protocol, subsID, accountAccessTier,
438-
createPrivateEndpoint, pointer.BoolDeref(allowBlobPublicAccess, false), pointer.BoolDeref(requireInfraEncryption, false),
438+
pointer.BoolDeref(createPrivateEndpoint, false), pointer.BoolDeref(allowBlobPublicAccess, false), pointer.BoolDeref(requireInfraEncryption, false),
439439
pointer.BoolDeref(enableLFS, false), pointer.BoolDeref(disableDeleteRetentionPolicy, false))
440440
// search in cache first
441441
cache, err := d.accountSearchCache.Get(lockKey, azcache.CacheReadTypeDefault)
@@ -485,7 +485,7 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
485485
}
486486
}
487487

488-
if createPrivateEndpoint {
488+
if pointer.BoolDeref(createPrivateEndpoint, false) {
489489
setKeyValueInMap(parameters, serverNameField, fmt.Sprintf("%s.privatelink.file.%s", accountName, storageEndpointSuffix))
490490
}
491491

0 commit comments

Comments
 (0)