Merge pull request #399 from andyzhangx/no-cloud-provider

fix: controller could run well without cloud provider

Author: andyzhangx

deploy/example/azure.json

@@ -1,17 +1,12 @@
 {
-    "cloud":"AzurePublicCloud",                    // mandatory
-    "tenantId": "xxxx-xxxx-xxxx-xxxx-xxxx",        // mandatory
-    "subscriptionId": "xxxx-xxxx-xxxx-xxxx-xxxx",  // mandatory
-    "resourceGroup": "resource-group-name",        // mandatory
-    "location": "eastus2",                         // mandatory
-    "aadClientId": "xxxx-xxxx-xxxx-xxxx-xxxx",     // mandatory if using service principal
-    "aadClientSecret": "xxxx-xxxx-xxxx-xxxx-xxxx", // mandatory if using service principal
-    "useManagedIdentityExtension": false,          // set true if using managed idenitty
-    "userAssignedIdentityID": "",                  // mandatory if using managed idenitty
-    "useInstanceMetadata": true,                   // optional
-    "vmType": "standard",                          // optional
-    "subnetName": "k8s-subnet",                    // optional
-    "vnetName": "k8s-vnet-17181929",               // optional
-    "vnetResourceGroup": "",                       // optional
-    "cloudProviderBackoff": true                   // optional
-}
+    "cloud":"AzurePublicCloud",
+    "tenantId": "xxxx-xxxx-xxxx-xxxx-xxxx",
+    "subscriptionId": "xxxx-xxxx-xxxx-xxxx-xxxx",
+    "resourceGroup": "resource-group-name",
+    "location": "eastus2",
+    "aadClientId": "xxxx-xxxx-xxxx-xxxx-xxxx",
+    "aadClientSecret": "xxxx-xxxx-xxxx-xxxx-xxxx",
+    "useManagedIdentityExtension": false,
+    "userAssignedIdentityID": "",
+    "useInstanceMetadata": true
+}

pkg/blob/azure.go

@@ -89,22 +89,21 @@ func getCloudProvider(kubeconfig, nodeID string) (*azureprovider.Cloud, error) {
 		az.KubeClient = kubeClient
 	}
 
+	if err != nil {
+		klog.V(2).Infof("no cloud config provided, error: %v, driver will run without cloud config", err)
+	}
+
 	isController := (nodeID == "")
 	if isController {
-		if err != nil {
-			// controller depends on cloud config
-			return az, err
+		if err == nil {
+			// Disable UseInstanceMetadata for controller to mitigate a timeout issue using IMDS
+			// https://github.com/kubernetes-sigs/azuredisk-csi-driver/issues/168
+			klog.V(2).Infof("disable UseInstanceMetadata for controller server")
+			az.Config.UseInstanceMetadata = false
 		}
-		// Disable UseInstanceMetadata for controller to mitigate a timeout issue using IMDS
-		// https://github.com/kubernetes-sigs/azuredisk-csi-driver/issues/168
-		klog.V(2).Infof("disable UseInstanceMetadata for controller server")
-		az.Config.UseInstanceMetadata = false
-		klog.V(2).Infof("Starting controller server...")
+		klog.V(2).Infof("starting controller server...")
 	} else {
-		if err != nil {
-			klog.V(2).Infof("no cloud config provided, error: %v, node server will run without cloud config", err)
-		}
-		klog.V(2).Infof("Starting node server on node(%s)", nodeID)
+		klog.V(2).Infof("starting node server on node(%s)", nodeID)
 	}
 
 	return az, nil

pkg/blob/azure_test.go

@@ -81,13 +81,13 @@ users:
 			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),
+			expectedErr: nil,
 		},
 		{
 			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),
+			expectedErr: nil,
 		},
 		{
 			desc:        "[failure] out of cluster & in cluster, specify a empty kubeconfig, no credential file",
@@ -99,7 +99,7 @@ users:
 			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),
+			expectedErr: nil,
 		},
 		{
 			desc:        "[success] out of cluster & in cluster, no kubeconfig, a fake credential file",