fix: disable UseInstanceMetadata for controller

Author: andyzhangx

charts/latest/blobfuse-csi-driver/templates/csi-blobfuse-controller.yaml

@@ -92,7 +92,6 @@ spec:
           args:
             - "--v=5"
             - "--endpoint=$(CSI_ENDPOINT)"
-            - "--nodeid=$(KUBE_NODE_NAME)"
           ports:
             - containerPort: 29622
               name: healthz

deploy/csi-blobfuse-controller.yaml

@@ -88,7 +88,6 @@ spec:
           image: mcr.microsoft.com/k8s/csi/blobfuse-csi:latest
           args:
             - "--v=5"
-            - "--endpoint=$(CSI_ENDPOINT)"
             - "--nodeid=$(KUBE_NODE_NAME)"
           ports:
             - containerPort: 29622

pkg/blobfuse/blobfuse.go

@@ -79,6 +79,13 @@ func (d *Driver) Run(endpoint, kubeconfig string) {
 	}
 	d.cloud = cloud
 
+	if d.NodeID == "" {
+		// 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
+	}
+
 	d.mounter = &mount.SafeFormatAndMount{
 		Interface: mount.New(""),
 		Exec:      mount.NewOsExec(),

pkg/blobfuse/controllerserver.go

@@ -81,10 +81,6 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 		resourceGroup = d.cloud.ResourceGroup
 	}
 
-	// Disable UseInstanceMetadata to mitigate a timeout issue from IMDS
-	// https://github.com/kubernetes-sigs/azuredisk-csi-driver/issues/168
-	d.cloud.Config.UseInstanceMetadata = false
-
 	account, accountKey, err := d.cloud.EnsureStorageAccount(accountName, storageAccountType, string(storage.StorageV2), resourceGroup, location, blobfuseAccountNamePrefix)
 	if err != nil {
 		return nil, fmt.Errorf("could not get storage key for storage account %s: %v", accountName, err)
@@ -148,10 +144,6 @@ func (d *Driver) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeRequest)
 		resourceGroupName = d.cloud.ResourceGroup
 	}
 
-	// Disable UseInstanceMetadata to mitigate a timeout issue from IMDS
-	// https://github.com/kubernetes-sigs/azuredisk-csi-driver/issues/168
-	d.cloud.Config.UseInstanceMetadata = false
-
 	accountKey, err := d.cloud.GetStorageAccesskey(accountName, resourceGroupName)
 	if err != nil {
 		return nil, fmt.Errorf("no key for storage account(%s) under resource group(%s), err %v", accountName, resourceGroupName, err)