update blobfuse proxy deb package

kubernetes-sigs · Apr 28, 2021 · d240383 · d240383
1 parent 51b9e7f
commit d240383
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -46,7 +46,7 @@ OUTPUT_TYPE ?= registry
 ALL_ARCH.linux = amd64 #arm64
 ALL_OS_ARCH = $(foreach arch, ${ALL_ARCH.linux}, linux-$(arch))
 
-all: blob
+all: blob blobfuse-proxy
 
 .PHONY: verify
 verify: unit-test
@@ -69,7 +69,7 @@ e2e-test:
 	go test -v -timeout=0 ./test/e2e ${GINKGO_FLAGS}
 
 .PHONY: e2e-bootstrap
-e2e-bootstrap: install-helm 
+e2e-bootstrap: install-helm
 	# Only build and push the image if it does not exist in the registry
 	docker pull $(IMAGE_TAG) || make blob-container push
 	if [ ! -z "$(ENABLE_BLOBFUSE_PROXY)" ]; then \

diff --git a/deploy/blobfuse-proxy/blobfuse-proxy.yaml b/deploy/blobfuse-proxy/blobfuse-proxy.yaml
@@ -44,7 +44,7 @@ spec:
             apt-get update
             apt-get install -y blobfuse=1.3.6
             # download blobfuse-proxy .deb package
-            wget https://github.com/kubernetes-sigs/blob-csi-driver/raw/master/deploy/blobfuse-proxy/v0.1.0/blobfuse-proxy-v0.1.0.deb -O /tmp/blobfuse-proxy-v0.1.0.deb
+            wget https://github.com/boddumanohar/blob-csi-driver/raw/issues/392/deploy/blobfuse-proxy/v0.1.0/blobfuse-proxy-v0.1.0.deb -O /tmp/blobfuse-proxy-v0.1.0.deb
             dpkg -i /tmp/blobfuse-proxy-v0.1.0.deb
             mkdir -p /var/lib/kubelet/plugins/blob.csi.azure.com
             echo "Enabling blobfuse proxy systemctl service"
@@ -54,8 +54,8 @@ spec:
             systemctl start blobfuse-proxy
             echo "removing the file: /tmp/blobfuse-proxy-v0.1.0.deb"
             rm /tmp/blobfuse-proxy-v0.1.0.deb
-            echo "sleeping for 10 secs"
-            sleep 10s
+            echo "waiting for blobfuse-proxy service to start"
+            sleep 3s
             # tail blobfuse proxy logs
             journalctl -u blobfuse-proxy -f
         image: alpine

diff --git a/deploy/blobfuse-proxy/v0.1.0/blobfuse-proxy-v0.1.0.deb b/deploy/blobfuse-proxy/v0.1.0/blobfuse-proxy-v0.1.0.deb
diff --git a/pkg/blobfuse-proxy/README.md b/pkg/blobfuse-proxy/README.md
@@ -42,6 +42,6 @@ make blobfuse-proxy
 
  - Generate debian dpkg package
 ```console
-cp _output/blobfuse-proxy ./pkg/blobfuse-proxy/usr/bin/blobfuse-proxy
+cp _output/blobfuse-proxy ./pkg/blobfuse-proxy/debpackage/usr/bin/blobfuse-proxy
 dpkg-deb --build pkg/blobfuse-proxy/debpackage
 ```