Merge pull request #141 from andyzhangx/disable-imds

feat: disable IMDS in controller to support MSI

Author: andyzhangx

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

@@ -14,6 +14,7 @@ spec:
 {{ include "blobfuse.labels" . | indent 6 }}
         app: csi-blobfuse-controller
     spec:
+      hostNetwork: true
       serviceAccountName: csi-blobfuse-controller-sa
       nodeSelector:
         kubernetes.io/os: linux
@@ -91,7 +92,6 @@ spec:
           args:
             - "--v=5"
             - "--endpoint=$(CSI_ENDPOINT)"
-            - "--nodeid=$(KUBE_NODE_NAME)"
           ports:
             - containerPort: 29622
               name: healthz

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

@@ -13,6 +13,7 @@ spec:
 {{ include "blobfuse.labels" . | indent 6 }}
         app: csi-blobfuse-node
     spec:
+      hostNetwork: true
       serviceAccountName: csi-blobfuse-node-sa
       nodeSelector:
         kubernetes.io/os: linux

deploy/csi-blobfuse-controller.yaml

@@ -14,6 +14,7 @@ spec:
       labels:
         app: csi-blobfuse-controller
     spec:
+      hostNetwork: true
       serviceAccountName: csi-blobfuse-controller-sa
       nodeSelector:
         kubernetes.io/os: linux
@@ -87,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

deploy/csi-blobfuse-node.yaml

@@ -13,6 +13,7 @@ spec:
       labels:
         app: csi-blobfuse-node
     spec:
+      hostNetwork: true
       serviceAccountName: csi-blobfuse-node-sa
       nodeSelector:
         kubernetes.io/os: linux

hack/verify-yamllint.sh

@@ -26,7 +26,7 @@ deployDirNum=`ls deploy/*.yaml | wc -l`
 helmDirNum=`ls $helmPath/*.yaml | grep -v serviceaccount | wc -l`
 if [[ "${deployDirNum}" != "${helmDirNum}" ]]; then
   echo "yaml file num($deployDirNum) under deploy/ not equal to num($helmDirNum) under $helmPath"
-  #exit 1
+  exit 1
 fi
 
 for path in "deploy/*.yaml" "deploy/example/*.yaml"

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(),