Skip to content

Commit 6a34f7e

Browse files
authored
Merge pull request #337 from andyzhangx/nil-check
fix: always initialize driver cloud config
2 parents 163547e + c036c66 commit 6a34f7e

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

pkg/blob/azure.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,12 @@ func IsAzureStackCloud(cloud *azureprovider.Cloud) bool {
4848

4949
// getCloudProvider get Azure Cloud Provider
5050
func getCloudProvider(kubeconfig, nodeID string) (*azureprovider.Cloud, error) {
51-
isController := (nodeID == "")
52-
51+
az := &azureprovider.Cloud{}
5352
kubeClient, err := getKubeClient(kubeconfig)
5453
if err != nil && !os.IsNotExist(err) && err != rest.ErrNotInCluster {
55-
return nil, fmt.Errorf("failed to get KubeClient: %v", err)
54+
return az, fmt.Errorf("failed to get KubeClient: %v", err)
5655
}
5756

58-
az := &azureprovider.Cloud{}
59-
6057
if kubeClient != nil {
6158
klog.V(2).Infof("reading cloud config from secret")
6259
az.KubeClient = kubeClient
@@ -92,6 +89,7 @@ func getCloudProvider(kubeconfig, nodeID string) (*azureprovider.Cloud, error) {
9289
az.KubeClient = kubeClient
9390
}
9491

92+
isController := (nodeID == "")
9593
if isController {
9694
if err != nil {
9795
// controller depends on cloud config

0 commit comments

Comments
 (0)