Optimize the logic of getCloudProvider func

Signed-off-by: ZeroMagic <[email protected]>

Author: ZeroMagic

pkg/blob/azure.go

@@ -47,7 +47,9 @@ func IsAzureStackCloud(cloud *azureprovider.Cloud) bool {
 }
 
 // getCloudProvider get Azure Cloud Provider
-func getCloudProvider(kubeconfig string) (*azureprovider.Cloud, error) {
+func getCloudProvider(kubeconfig, nodeID string) (*azureprovider.Cloud, error) {
+	isController := (nodeID == "")
+
 	kubeClient, err := getKubeClient(kubeconfig)
 	if err != nil && !os.IsNotExist(err) && err != rest.ErrNotInCluster {
 		return nil, fmt.Errorf("failed to get KubeClient: %v", err)
@@ -71,22 +73,38 @@ func getCloudProvider(kubeconfig string) (*azureprovider.Cloud, error) {
 			klog.V(2).Infof("use default %s env var: %v", DefaultAzureCredentialFileEnv, credFile)
 		}
 
-		f, err := os.Open(credFile)
+		var f *os.File
+		f, err = os.Open(credFile)
+		if f != nil {
+			defer f.Close()
+		}
 		if err != nil {
 			klog.Errorf("Failed to load config from file: %s", credFile)
-			return nil, fmt.Errorf("Failed to load config from file: %s, cloud not get azure cloud provider", credFile)
-		}
-		defer f.Close()
-
-		klog.V(2).Infof("read cloud config from file: %s successfully", credFile)
-		if az, err = azureprovider.NewCloudWithoutFeatureGates(f); err != nil {
-			return az, err
+			err = fmt.Errorf("Failed to load config from file: %s, cloud not get azure cloud provider", credFile)
+		} else {
+			klog.V(2).Infof("read cloud config from file: %s successfully", credFile)
+			az, err = azureprovider.NewCloudWithoutFeatureGates(f)
 		}
 	}
 
 	if kubeClient != nil {
 		az.KubeClient = kubeClient
 	}
+	if isController {
+		if err != nil {
+			return az, err
+		}
+		// Disable UseInstanceMetadata for controller to mitigate a timeout issue using IMDS
+		// https://github.com/kubernetes-sigs/azuredisk-csi-driver/issues/168
+		klog.Infoln("disable UseInstanceMetadata for controller")
+		az.Config.UseInstanceMetadata = false
+		klog.Infoln("Starting the controller server...")
+	} else {
+		if err != nil {
+			klog.V(2).Infof("there is no azure.json provided for node server, error: %v", err)
+		}
+		klog.V(2).Infof("Starting the node server, nodeID is(%s)", nodeID)
+	}
 
 	return az, nil
 }

pkg/blob/azure_test.go

@@ -75,31 +75,37 @@ users:
 	tests := []struct {
 		desc        string
 		kubeconfig  string
+		nodeID      string
 		expectedErr error
 	}{
 		{
 			desc:        "[failure] out of cluster, no kubeconfig, no credential file",
 			kubeconfig:  "",
+			nodeID:      "",
 			expectedErr: fmt.Errorf("Failed to load config from file: %s, cloud not get azure cloud provider", DefaultCredFilePath),
 		},
 		{
 			desc:        "[failure] out of cluster & in cluster, specify a non-exist kubeconfig, no credential file",
 			kubeconfig:  "/tmp/non-exist.json",
+			nodeID:      "",
 			expectedErr: fmt.Errorf("Failed to load config from file: %s, cloud not get azure cloud provider", DefaultCredFilePath),
 		},
 		{
 			desc:        "[failure] out of cluster & in cluster, specify a empty kubeconfig, no credential file",
 			kubeconfig:  emptyKubeConfig,
+			nodeID:      "",
 			expectedErr: fmt.Errorf("failed to get KubeClient: invalid configuration: no configuration has been provided, try setting KUBERNETES_MASTER environment variable"),
 		},
 		{
 			desc:        "[failure] out of cluster & in cluster, specify a fake kubeconfig, no credential file",
 			kubeconfig:  fakeKubeConfig,
+			nodeID:      "",
 			expectedErr: fmt.Errorf("Failed to load config from file: %s, cloud not get azure cloud provider", DefaultCredFilePath),
 		},
 		{
 			desc:        "[success] out of cluster & in cluster, no kubeconfig, a fake credential file",
 			kubeconfig:  "",
+			nodeID:      "",
 			expectedErr: nil,
 		},
 	}
@@ -139,7 +145,7 @@ users:
 			}
 			os.Setenv(DefaultAzureCredentialFileEnv, fakeCredFile)
 		}
-		_, err := getCloudProvider(test.kubeconfig)
+		_, err := getCloudProvider(test.kubeconfig, test.nodeID)
 		if !reflect.DeepEqual(err, test.expectedErr) {
 			t.Errorf("desc: %s,\n input: %q, GetCloudProvider err: %v, expectedErr: %v", test.desc, test.kubeconfig, err, test.expectedErr)
 		}

pkg/blob/blob.go

@@ -46,7 +46,7 @@ const (
 	volumeIDTemplate           = "%s#%s#%s"
 	secretNameTemplate         = "azure-storage-account-%s-secret"
 	serverNameField            = "server"
-	blobStorageEndPointField   = "blobstorageendpoint"
+	storageEndpointSuffixField = "storageendpointsuffix"
 	tagsField                  = "tags"
 	protocolField              = "protocol"
 	accountNameField           = "accountname"
@@ -116,35 +116,9 @@ func (d *Driver) Run(endpoint, kubeconfig string, testBool bool) {
 	}
 	klog.Infof("\nDRIVER INFORMATION:\n-------------------\n%s\n\nStreaming logs below:", versionMeta)
 
-	// For the controller server, the NodeID is nil. For the node server, the NodeID is not nil.
-	if d.NodeID == "" {
-		cloud, err := getCloudProvider(kubeconfig)
-		if err != nil || cloud.TenantID == "" || cloud.SubscriptionID == "" {
-			klog.Fatalf("failed to get Azure Cloud Provider, error: %v", err)
-		}
-		d.cloud = cloud
-		// Disable UseInstanceMetadata for controller to mitigate a timeout issue using IMDS
-		// https://github.com/kubernetes-sigs/azuredisk-csi-driver/issues/168
-		klog.Infoln("disable UseInstanceMetadata for controller")
-		d.cloud.Config.UseInstanceMetadata = false
-		klog.Infoln("Starting the controller server...")
-	} else {
-		cloud, err := getCloudProvider(kubeconfig)
-		if err == nil {
-			d.cloud = cloud
-		} else {
-			klog.V(2).Infof("there is no azure.json provided for node server")
-			d.cloud = &azure.Cloud{}
-			kubeClient, err := getKubeClient(kubeconfig)
-			if err != nil {
-				klog.Infof("failed to get KubeClient: %v", err)
-			}
-			if kubeClient != nil {
-				d.cloud.KubeClient = kubeClient
-			}
-		}
-
-		klog.V(2).Infof("Starting the node server, nodeID is(%s)", d.NodeID)
+	d.cloud, err = getCloudProvider(kubeconfig, d.NodeID)
+	if err != nil {
+		klog.Fatalf("failed to get Azure Cloud Provider, error: %v", err)
 	}
 
 	d.mounter = &mount.SafeFormatAndMount{

pkg/blob/nodeserver.go

@@ -135,15 +135,15 @@ func (d *Driver) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRe
 	attrib := req.GetVolumeContext()
 	secrets := req.GetSecrets()
 
-	var serverAddress, blobStorageEndPoint, protocol string
+	var serverAddress, storageEndpointSuffix, protocol string
 	for k, v := range attrib {
 		switch strings.ToLower(k) {
 		case serverNameField:
 			serverAddress = v
 		case protocolField:
 			protocol = v
-		case blobStorageEndPointField:
-			blobStorageEndPoint = v
+		case storageEndpointSuffixField:
+			storageEndpointSuffix = v
 		}
 	}
 
@@ -152,13 +152,13 @@ func (d *Driver) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRe
 		return nil, err
 	}
 
-	if strings.TrimSpace(blobStorageEndPoint) == "" {
-		blobStorageEndPoint = "core.windows.net"
+	if strings.TrimSpace(storageEndpointSuffix) == "" {
+		storageEndpointSuffix = "core.windows.net"
 	}
 
 	if strings.TrimSpace(serverAddress) == "" {
 		// server address is "accountname.blob.core.windows.net" by default
-		serverAddress = fmt.Sprintf("%s.blob.%s", accountName, blobStorageEndPoint)
+		serverAddress = fmt.Sprintf("%s.blob.%s", accountName, storageEndpointSuffix)
 	}
 
 	if protocol == nfs {