Skip to content

Commit 635a14a

Browse files
committed
chore: refactor cloud config read logic
revert
1 parent de40387 commit 635a14a

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

docs/driver-parameters.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ storageAccount | specify Azure storage account name| STORAGE_ACCOUNT_NAME | - No
1515
protocol | specify blobfuse mount or NFSv3 mount | `fuse`, `nfs` | No | `fuse`
1616
containerName | specify the existing container name | existing container name | No | if empty, driver will create a new container name, starting with `pvc-fuse` for blobfuse or `pvc-nfs` for NFSv3
1717
server | specify Azure storage account server address | existing server address, e.g. `accountname.privatelink.blob.core.windows.net` | No | if empty, driver will use default `accountname.blob.core.windows.net` or other sovereign cloud account address
18+
storageEndpointSuffix | specify Azure storage endpoint suffix for agent node | `core.windows.net` | No | if empty, driver will use default storage endpoint suffix `core.windows.net`
1819
tags | [tags](https://docs.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources) would be created in newly created storage account | tag format: 'foo=aaa,bar=bbb' | No | ""
1920

2021
- `fsGroup` securityContext setting

pkg/blob/azure.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,23 +87,26 @@ func getCloudProvider(kubeconfig, nodeID string) (*azureprovider.Cloud, error) {
8787
}
8888
}
8989

90-
if kubeClient != nil {
90+
// reassign kubeClient
91+
if kubeClient != nil && az.KubeClient == nil {
9192
az.KubeClient = kubeClient
9293
}
94+
9395
if isController {
9496
if err != nil {
97+
// controller depends on cloud config
9598
return az, err
9699
}
97100
// Disable UseInstanceMetadata for controller to mitigate a timeout issue using IMDS
98101
// https://github.com/kubernetes-sigs/azuredisk-csi-driver/issues/168
99-
klog.Infoln("disable UseInstanceMetadata for controller")
102+
klog.V(2).Infof("disable UseInstanceMetadata for controller server")
100103
az.Config.UseInstanceMetadata = false
101-
klog.Infoln("Starting the controller server...")
104+
klog.V(2).Infof("Starting controller server...")
102105
} else {
103106
if err != nil {
104-
klog.V(2).Infof("there is no azure.json provided for node server, error: %v", err)
107+
klog.V(2).Infof("no cloud config provided, error: %v, node server will run without cloud config", err)
105108
}
106-
klog.V(2).Infof("Starting the node server, nodeID is(%s)", nodeID)
109+
klog.V(2).Infof("Starting node server on node(%s)", nodeID)
107110
}
108111

109112
return az, nil

0 commit comments

Comments
 (0)