Merge pull request #595 from andyzhangx/arm64-2

feat: support arm64

Author: andyzhangx

Makefile

@@ -41,10 +41,13 @@ GOBIN ?= $(GOPATH)/bin
 DOCKER_CLI_EXPERIMENTAL = enabled
 export GOPATH GOBIN GO111MODULE DOCKER_CLI_EXPERIMENTAL
 
+# The current context of image building
+# The architecture of the image
+ARCH ?= amd64
 # Output type of docker buildx build
 OUTPUT_TYPE ?= registry
 
-ALL_ARCH.linux = amd64 #arm64
+ALL_ARCH.linux = amd64 arm64
 ALL_OS_ARCH = $(foreach arch, ${ALL_ARCH.linux}, linux-$(arch))
 
 all: blob blobfuse-proxy
@@ -93,7 +96,7 @@ e2e-teardown:
 
 .PHONY: blob
 blob: blobfuse-proxy
-	CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) go build -a -ldflags ${LDFLAGS} -mod vendor -o _output/blobplugin ./pkg/blobplugin
+	CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) go build -a -ldflags ${LDFLAGS} -mod vendor -o _output/${ARCH}/blobplugin ./pkg/blobplugin
 
 .PHONY: blob-windows
 blob-windows:
@@ -121,7 +124,9 @@ ifeq ($(CLOUD), AzureStackCloud)
 	docker run --privileged --name buildx_buildkit_container-builder0 -d --mount type=bind,src=/etc/ssl/certs,dst=/etc/ssl/certs moby/buildkit:latest || true
 endif
 	# enable qemu for arm64 build
-	# docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+	# https://github.com/docker/buildx/issues/464#issuecomment-741507760
+	docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-aarch64
+	docker run --rm --privileged tonistiigi/binfmt --install all
 	for arch in $(ALL_ARCH.linux); do \
 		ARCH=$${arch} $(MAKE) blob; \
 		ARCH=$${arch} $(MAKE) container-linux; \

pkg/blobplugin/Dockerfile

@@ -13,7 +13,10 @@
 # limitations under the License.
 
 FROM k8s.gcr.io/build-image/debian-base:bullseye-v1.0.0
-COPY ./_output/blobplugin /blobplugin
+
+ARG ARCH=amd64
+COPY ./_output/${ARCH}/blobplugin /blobplugin
+
 RUN apt update && apt-mark unhold libcap2
 RUN clean-install ca-certificates libfuse-dev libcurl4-gnutls-dev libgnutls28-dev uuid-dev libgcrypt20-dev util-linux mount udev wget e2fsprogs nfs-common netbase
 # install updated packages to fix CVE issues
@@ -23,7 +26,8 @@ COPY ./_output/blobfuse-proxy.deb /blobfuse-proxy/
 # for compatibility, remove this after v1.6.0 release (todo)
 COPY deploy/blobfuse-proxy/v0.1.0/blobfuse-proxy-v0.1.0.deb /blobfuse-proxy/
 RUN wget -O /blobfuse-proxy/packages-microsoft-prod.deb https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb
-RUN dpkg -i /blobfuse-proxy/packages-microsoft-prod.deb && apt update && apt install blobfuse fuse -y
+ARG ARCH=amd64
+RUN if [ "$ARCH" = "amd64" ] ; then dpkg -i /blobfuse-proxy/packages-microsoft-prod.deb && apt update && apt install blobfuse fuse -y; fi
 RUN apt remove wget -y
 LABEL maintainers="andyzhangx"
 LABEL description="Azure Blob Storage CSI driver"

test/integration/run-test.sh

@@ -34,7 +34,7 @@ readonly cloud="$5"
 echo "Begin to run integration test on $cloud..."
 
 # Run CSI driver as a background service
-_output/blobplugin --endpoint "$endpoint" --nodeid CSINode --enable-blob-mock-mount -v=5 &
+_output/amd64/blobplugin --endpoint "$endpoint" --nodeid CSINode --enable-blob-mock-mount -v=5 &
 trap cleanup EXIT
 
 if [[ "$cloud" == "AzureChinaCloud" ]]; then

test/sanity/run-test.sh

@@ -32,8 +32,8 @@ if [[ "$#" -gt 0 ]] && [[ -n "$1" ]]; then
   nodeid="$1"
 fi
 
-_output/blobplugin --endpoint "$controllerendpoint" -v=5 &
-_output/blobplugin --endpoint "$nodeendpoint" --nodeid "$nodeid" --enable-blob-mock-mount -v=5 &
+_output/amd64/blobplugin --endpoint "$controllerendpoint" -v=5 &
+_output/amd64/blobplugin --endpoint "$nodeendpoint" --nodeid "$nodeid" --enable-blob-mock-mount -v=5 &
 
 echo "Begin to run sanity test..."
 readonly CSI_SANITY_BIN='csi-sanity'