Merge pull request #92 from andyzhangx/install-standalone-driver

feat: use standalone blobfuse driver

Author: andyzhangx

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

@@ -90,12 +90,8 @@ spec:
             - mountPath: /var/lib/waagent/ManagedIdentity-Settings
               readOnly: true
               name: msi
-            - mountPath: /usr/blob/
-              name: blobfuse-bin
             - mountPath: /mnt
               name: blobfuse-cache
-            - mountPath: /etc/fuse.conf
-              name: fuse-conf
       volumes:
         - hostPath:
             path: /var/lib/kubelet/plugins/blobfuse.csi.azure.com
@@ -116,13 +112,6 @@ spec:
         - hostPath:
             path: /var/lib/waagent/ManagedIdentity-Settings
           name: msi
-        - hostPath:
-            path: /usr/bin
-          name: blobfuse-bin
         - hostPath:
             path: /mnt
-          name: blobfuse-cache
-        - hostPath:
-            path: /etc/fuse.conf
-            type: FileOrCreate
-          name: fuse-conf
+          name: blobfuse-cache

deploy/csi-blobfuse-node.yaml

@@ -89,12 +89,8 @@ spec:
             - mountPath: /var/lib/waagent/ManagedIdentity-Settings
               readOnly: true
               name: msi
-            - mountPath: /usr/blob/
-              name: blobfuse-bin
             - mountPath: /mnt
               name: blobfuse-cache
-            - mountPath: /etc/fuse.conf
-              name: fuse-conf
       volumes:
         - hostPath:
             path: /var/lib/kubelet/plugins/blobfuse.csi.azure.com
@@ -115,13 +111,6 @@ spec:
         - hostPath:
             path: /var/lib/waagent/ManagedIdentity-Settings
           name: msi
-        - hostPath:
-            path: /usr/bin
-          name: blobfuse-bin
         - hostPath:
             path: /mnt
-          name: blobfuse-cache
-        - hostPath:
-            path: /etc/fuse.conf
-            type: FileOrCreate
-          name: fuse-conf
+          name: blobfuse-cache

pkg/blobfuse/nodeserver.go

@@ -96,7 +96,7 @@ func (d *Driver) NodePublishVolume(ctx context.Context, req *csi.NodePublishVolu
 	for _, opt := range mountOptions {
 		args = args + " " + opt
 	}
-	cmd := exec.Command("/usr/blob/blobfuse", strings.Split(args, " ")...)
+	cmd := exec.Command("blobfuse", strings.Split(args, " ")...)
 	cmd.Env = append(os.Environ(), "AZURE_STORAGE_ACCOUNT="+accountName)
 
 	if accountSasToken != "" {

pkg/blobfuseplugin/Dockerfile

@@ -12,8 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ubuntu:16.04
-RUN apt-get update && apt-get install -y ca-certificates pkg-config libfuse-dev cmake libcurl4-gnutls-dev libgnutls28-dev uuid-dev libgcrypt20-dev
+FROM mcr.microsoft.com/aks/fundamental/base-ubuntu:v0.0.5
+RUN wget -O /tmp/packages-microsoft-prod.deb https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb
+RUN dpkg -i /tmp/packages-microsoft-prod.deb && apt-get update && apt-get install -y ca-certificates pkg-config libfuse-dev cmake libcurl4-gnutls-dev libgnutls28-dev uuid-dev libgcrypt20-dev blobfuse
 LABEL maintainers="andyzhangx"
 LABEL description="Blobfuse CSI Driver"
 

pkg/blobfuseplugin/main.go

@@ -54,8 +54,7 @@ func main() {
 		os.Exit(0)
 	}
 	if *nodeID == "" {
-		klog.Error("--nodeid is a required parameter")
-		os.Exit(1)
+		klog.Warning("nodeid is empty")
 	}
 
 	exportMetrics()

test/integration/run-tests-all-clouds.sh

@@ -23,7 +23,7 @@ readonly cloud="$2"
 
 # copy blobfuse binary
 mkdir -p /usr/blob
-cp test/artifacts/blobfuse /usr/blob/blobfuse
+cp test/artifacts/blobfuse /usr/bin/blobfuse
 
 apt update && apt install libfuse2 -y
 test/integration/run-test.sh "tcp://127.0.0.1:10000" "/tmp/testmount1" "$resource_group" "$cloud"

test/sanity/run-tests-all-clouds.sh

@@ -35,7 +35,7 @@ trap cleanup EXIT
 
 # copy blobfuse binary
 mkdir -p /usr/blob
-cp test/artifacts/blobfuse /usr/blob/blobfuse
+cp test/artifacts/blobfuse /usr/bin/blobfuse
 
 install_csi_sanity_bin
 apt update && apt install libfuse2 -y