Skip to content

Commit 6eb17aa

Browse files
authored
Merge pull request #494 from andyzhangx/storage-endpoint-on-prem
fix: storageEndpointSuffix issue in on-prem cluster
2 parents 979f6f4 + 3124ade commit 6eb17aa

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

pkg/blob/azure.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525

2626
kv "github.com/Azure/azure-sdk-for-go/services/keyvault/2016-10-01/keyvault"
2727
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network"
28+
"github.com/Azure/azure-sdk-for-go/storage"
2829

2930
"github.com/Azure/go-autorest/autorest"
3031

@@ -98,6 +99,9 @@ func getCloudProvider(kubeconfig, nodeID, secretName, secretNamespace, userAgent
9899

99100
if err != nil {
100101
klog.V(2).Infof("no cloud config provided, error: %v, driver will run without cloud config", err)
102+
if az.Environment.StorageEndpointSuffix == "" {
103+
az.Environment.StorageEndpointSuffix = storage.DefaultBaseURL
104+
}
101105
}
102106

103107
isController := (nodeID == "")

pkg/blob/nodeserver.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626

2727
volumehelper "sigs.k8s.io/blob-csi-driver/pkg/util"
2828

29+
"github.com/Azure/azure-sdk-for-go/storage"
2930
"github.com/container-storage-interface/spec/lib/go/csi"
3031

3132
"k8s.io/apimachinery/pkg/util/wait"
@@ -238,7 +239,7 @@ func (d *Driver) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRe
238239
if d.cloud.Environment.StorageEndpointSuffix != "" {
239240
storageEndpointSuffix = d.cloud.Environment.StorageEndpointSuffix
240241
} else {
241-
storageEndpointSuffix = "core.windows.net"
242+
storageEndpointSuffix = storage.DefaultBaseURL
242243
}
243244
}
244245

0 commit comments

Comments
 (0)