Merge pull request #356 from boddumanohar/blobfuse-proxy-code

feat: blobfuse proxy

Author: k8s-ci-robot

.github/workflows/linux.yaml

@@ -21,6 +21,10 @@ jobs:
     - name: Run unit test
       run: |
         export PATH=$PATH:$HOME/.local/bin
+        wget https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb
+        sudo dpkg -i packages-microsoft-prod.deb
+        sudo apt-get update
+        sudo apt-get install blobfuse
         make verify
 
     - name: Run build test
@@ -33,6 +37,11 @@ jobs:
         export PATH=$PATH:$HOME/.local/bin
         make container
 
+    - name: Make blobfuse-proxy test
+      run: |
+        export PATH=$PATH:$HOME/.local/bin
+        make blobfuse-proxy
+
     - name: Get code coverage
       env:
           COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Makefile

@@ -63,7 +63,7 @@ e2e-test:
 	go test -v -timeout=0 ./test/e2e ${GINKGO_FLAGS}
 
 .PHONY: e2e-bootstrap
-e2e-bootstrap: install-helm
+e2e-bootstrap: install-helm install-blobfuse-proxy
 	# Only build and push the image if it does not exist in the registry
 	docker pull $(IMAGE_TAG) || make blob-container push
 	helm install blob-csi-driver ./charts/latest/blob-csi-driver --namespace kube-system --wait --timeout=15m -v=5 --debug \
@@ -94,7 +94,7 @@ blob-darwin:
 
 .PHONY: container
 container: blob
-	docker build --no-cache -t $(IMAGE_TAG) -f ./pkg/blobplugin/dev.Dockerfile .
+	docker build -t $(IMAGE_TAG) -f ./pkg/blobplugin/dev.Dockerfile .
 
 .PHONY: blob-container
 blob-container:
@@ -147,3 +147,33 @@ create-metrics-svc:
 .PHONY: delete-metrics-svc
 delete-metrics-svc:
 	kubectl delete -f deploy/example/metrics/csi-blob-controller-svc.yaml --ignore-not-found
+
+# compile .proto file to go output
+.PHONY: gen-proto
+gen-proto:
+	protoc --proto_path=pkg/blobfuse-proxy/proto --go-grpc_out=pkg/blobfuse-proxy/pb --go_out=pkg/blobfuse-proxy/pb pkg/blobfuse-proxy/proto/*.proto
+
+# clean the files generated from .proto file
+.PHONY: clean-proto
+clean-proto:
+	rm pkg/blobfuse-proxy/pb/*.go
+
+.PHONY: blobfuse-proxy
+blobfuse-proxy:
+	CGO_ENABLED=0 GOOS=linux go build -mod vendor -o _output/blobfuse-proxy ./pkg/blobfuse-proxy
+
+.PHONY: blobfuse-proxy-container
+blobfuse-proxy-container:
+	sudo docker build -t blobfuse-proxy -f pkg/blobfuse-proxy/Dockerfile .
+
+.PHONY: install-blobfuse-proxy
+install-blobfuse-proxy:
+ifdef ENABLE_BLOBFUSE_PROXY
+	kubectl apply -f ./deploy/blobfuse-proxy/blobfuse-proxy.yaml
+else
+	echo "ENABLE_BLOBFUSE_PROXY env not found"
+endif
+
+.PHONY: uninstall-blobfuse-proxy
+uninstall-blobfuse-proxy:
+	kubectl delete -f ./deploy/blobfuse-proxy/blobfuse-proxy.yaml --ignore-not-found

deploy/blobfuse-proxy/blobfuse-proxy.yaml

@@ -0,0 +1,71 @@
+# This is to be used in e2e test, while for production, we suggest install this proxy as a standalone process
+---
+kind: DaemonSet
+apiVersion: apps/v1
+metadata:
+  name: csi-blobfuse-proxy
+  namespace: kube-system
+spec:
+  selector:
+    matchLabels:
+      app: csi-blobfuse-proxy
+  template:
+    metadata:
+      labels:
+        app: csi-blobfuse-proxy
+    spec:
+      hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet
+      nodeSelector:
+        kubernetes.io/os: linux
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: type
+                    operator: NotIn
+                    values:
+                      - virtual-kubelet
+      priorityClassName: system-node-critical
+      tolerations:
+        - operator: "Exists"
+      containers:
+        - name: proxy
+          image: bmanu199/blobfuse-proxy@sha256:65659c9effa9df94c42a5f8388cef9656343c8fdd47a200ab69dc53913af7a42
+          imagePullPolicy: IfNotPresent
+          args:
+            - "--blobfuse-proxy-endpoint=$(BLOBFUSE_PROXY_ENDPOINT)"
+          env:
+            - name: BLOBFUSE_PROXY_ENDPOINT
+              value: unix://csi/blobfuse-proxy.sock
+          securityContext:
+            privileged: true
+          volumeMounts:
+            - mountPath: /csi
+              name: socket-dir
+            - mountPath: /var/lib/kubelet/
+              mountPropagation: Bidirectional
+              name: mountpoint-dir
+            - mountPath: /mnt
+              name: blob-cache
+          resources:
+            limits:
+              cpu: 2
+              memory: 2100Mi
+            requests:
+              cpu: 10m
+              memory: 20Mi
+      volumes:
+        - hostPath:
+            path: /var/lib/kubelet/plugins/blob.csi.azure.com
+            type: DirectoryOrCreate
+          name: socket-dir
+        - hostPath:
+            path: /var/lib/kubelet/
+            type: DirectoryOrCreate
+          name: mountpoint-dir
+        - hostPath:
+            path: /mnt
+          name: blob-cache
+---

go.mod

@@ -10,14 +10,15 @@ require (
 	github.com/golang/mock v1.4.3
 	github.com/golang/protobuf v1.4.3
 	github.com/imdario/mergo v0.3.9 // indirect
-	github.com/kubernetes-csi/csi-lib-utils v0.7.0
+	github.com/kubernetes-csi/csi-lib-utils v0.9.1
 	github.com/onsi/ginkgo v1.11.0
 	github.com/onsi/gomega v1.8.1
 	github.com/pborman/uuid v1.2.0
 	github.com/pelletier/go-toml v1.2.0
-	github.com/stretchr/testify v1.6.1
+	github.com/stretchr/testify v1.7.0
 	golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
-	google.golang.org/grpc v1.28.0
+	google.golang.org/grpc v1.36.0
+	google.golang.org/protobuf v1.25.0
 	k8s.io/api v0.20.0
 	k8s.io/apimachinery v0.20.0
 	k8s.io/client-go v0.20.0
@@ -33,7 +34,7 @@ replace (
 	github.com/container-storage-interface/spec => github.com/container-storage-interface/spec v1.3.0
 	github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.7.1
 	go.etcd.io/etcd => go.etcd.io/etcd v0.0.0-20200410171415-59f5fb25a533
-	google.golang.org/grpc => google.golang.org/grpc v1.27.0
+	google.golang.org/grpc => google.golang.org/grpc v1.35.0
 	k8s.io/api => k8s.io/api v0.20.0
 	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.0
 	k8s.io/apimachinery => k8s.io/apimachinery v0.20.0