Revert "support arm64"

This reverts commit b5c9bfd.
cvvz · Aug 17, 2023 · 8036bf2 · 8036bf2
1 parent b3f9a6c
commit 8036bf2
Show file tree

Hide file tree

Showing 4 changed files with 110 additions and 97 deletions.
diff --git a/Makefile b/Makefile
@@ -55,7 +55,7 @@ OUTPUT_TYPE ?= registry
 
 ALL_ARCH.linux = amd64 arm64
 ALL_OS_ARCH = $(foreach arch, ${ALL_ARCH.linux}, linux-$(arch))
-ALL_PLATFORMS := $(foreach arch,${ALL_ARCH.linux},linux/$(arch))
+
 all: blob blobfuse-proxy
 
 .PHONY: verify
@@ -85,7 +85,7 @@ e2e-test: install-ginkgo
 .PHONY: e2e-bootstrap
 e2e-bootstrap: install-helm
 	# Only build and push the image if it does not exist in the registry
-	docker pull $(CSI_IMAGE_TAG) || make blob-container
+	docker pull $(CSI_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 \
 		--set controller.replicas=1 \
 		--set cloud=$(CLOUD) \
@@ -111,28 +111,25 @@ blob: blobfuse-proxy
 blob-windows:
 	CGO_ENABLED=0 GOOS=windows go build -a -ldflags ${LDFLAGS} -mod vendor -o _output/blobplugin.exe ./pkg/blobplugin
 
-.PHONY: blob-darwin
+.PHONT: blob-darwin
 blob-darwin:
 	CGO_ENABLED=0 GOOS=darwin go build -a -ldflags ${LDFLAGS} -mod vendor -o _output/blobplugin ./pkg/blobplugin
 
 .PHONY: container
 container: blob
 	docker build -t $(CSI_IMAGE_TAG) --output=type=docker -f ./pkg/blobplugin/Dockerfile .
 
-comma:= ,
-empty:=
-space:= $(empty) $(empty)
 .PHONY: container-linux
 container-linux:
-	docker buildx build --pull --output=type=$(OUTPUT_TYPE) --platform=$(subst $(space),$(comma),$(ALL_PLATFORMS)) \
+	docker buildx build --pull --output=type=$(OUTPUT_TYPE) --platform="linux/$(ARCH)" \
 		--provenance=false --sbom=false \
-		-t $(CSI_IMAGE_TAG) \
-		-f ./pkg/blobplugin/Dockerfile .
+		-t $(CSI_IMAGE_TAG)-linux-$(ARCH) --build-arg ARCH=$(ARCH) -f ./pkg/blobplugin/Dockerfile .
 
 .PHONY: blob-container
 blob-container:
 	docker buildx rm container-builder || true
 	docker buildx create --use --name=container-builder
+
 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
@@ -142,11 +139,31 @@ endif
 	docker run --rm --privileged tonistiigi/binfmt --install all
 	for arch in $(ALL_ARCH.linux); do \
 		ARCH=$${arch} $(MAKE) blob; \
+		ARCH=$${arch} $(MAKE) container-linux; \
 	done
-	$(MAKE) container-linux;
+
+.PHONY: push
+push:
+ifdef CI
+	docker manifest create --amend $(CSI_IMAGE_TAG) $(foreach osarch, $(ALL_OS_ARCH), $(CSI_IMAGE_TAG)-${osarch})
+	docker manifest push --purge $(CSI_IMAGE_TAG)
+	docker manifest inspect $(CSI_IMAGE_TAG)
+else
+	docker push $(CSI_IMAGE_TAG)
+endif
 
 .PHONY: push-latest
 push-latest:
+ifdef CI
+	docker manifest create --amend $(CSI_IMAGE_TAG_LATEST) $(foreach osarch, $(ALL_OS_ARCH), $(CSI_IMAGE_TAG)-${osarch})
+	docker manifest push --purge $(CSI_IMAGE_TAG_LATEST)
+	docker manifest inspect $(CSI_IMAGE_TAG_LATEST)
+else
+	docker push $(CSI_IMAGE_TAG_LATEST)
+endif
+
+.PHONY: build-push
+build-push: blob-container
 	docker tag $(CSI_IMAGE_TAG) $(CSI_IMAGE_TAG_LATEST)
 	docker push $(CSI_IMAGE_TAG_LATEST)
 
@@ -165,4 +182,4 @@ delete-metrics-svc:
 
 .PHONY: blobfuse-proxy
 blobfuse-proxy:
-	CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) go build -mod vendor -ldflags="-s -w" -o _output/${ARCH}/blobfuse-proxy ./pkg/blobfuse-proxy
+	CGO_ENABLED=0 GOOS=linux go build -mod vendor -ldflags="-s -w" -o _output/${ARCH}/blobfuse-proxy ./pkg/blobfuse-proxy
diff --git a/hack/release-image.sh b/hack/release-image.sh
@@ -28,6 +28,7 @@ export CI=1
 export PUBLISH=1
 az acr login --name $REGISTRY_NAME
 make blob-container
+make push
 make push-latest
 
 echo "sleep 60s ..."

diff --git a/pkg/blobfuse-proxy/init.sh b/pkg/blobfuse-proxy/init.sh
@@ -26,104 +26,99 @@ HOST_CMD="nsenter --mount=/proc/1/ns/mnt"
 
 DISTRIBUTION=$($HOST_CMD cat /etc/os-release | grep ^ID= | cut -d'=' -f2 | tr -d '"')
 echo "Linux distribution: $DISTRIBUTION"
-ARCH=$($HOST_CMD uname -m)
-echo "Linux Arch is $(uname -m)"
 
-if [ "${ARCH}" != "aarch64" ]
+if [ "${DISTRIBUTION}" = "ubuntu" ] && { [ "${INSTALL_BLOBFUSE}" = "true" ] || [ "${INSTALL_BLOBFUSE2}" = "true" ]; }
 then
-  if [ "${DISTRIBUTION}" = "ubuntu" ] && { [ "${INSTALL_BLOBFUSE}" = "true" ] || [ "${INSTALL_BLOBFUSE2}" = "true" ]; }
+  release=$($HOST_CMD lsb_release -rs)
+  echo "Ubuntu release: $release"
+
+  if [ "$(expr "$release" \< "22.04")" -eq 1 ]
   then
-    release=$($HOST_CMD lsb_release -rs)
-    echo "Ubuntu release: $release"
-
-    if [ "$(expr "$release" \< "22.04")" -eq 1 ]
-    then
-      cp /blobfuse-proxy/packages-microsoft-prod-18.04.deb /host/etc/packages-microsoft-prod.deb
+    cp /blobfuse-proxy/packages-microsoft-prod-18.04.deb /host/etc/packages-microsoft-prod.deb
+  else
+    cp /blobfuse-proxy/packages-microsoft-prod-22.04.deb /host/etc/packages-microsoft-prod.deb
+  fi
+
+  # when running dpkg -i /etc/packages-microsoft-prod.deb, need to enter y to continue. 
+  # refer to https://stackoverflow.com/questions/45349571/how-to-install-deb-with-dpkg-non-interactively
+  yes | $HOST_CMD dpkg -i /etc/packages-microsoft-prod.deb && $HOST_CMD apt update
+
+  pkg_list=""
+  if [ "${INSTALL_BLOBFUSE}" = "true" ] && [ "$(expr "$release" \< "22.04")" -eq 1 ]
+  then
+    pkg_list="${pkg_list} fuse"
+    # install blobfuse with latest version or specific version
+    if [ -z "${BLOBFUSE_VERSION}" ]; then
+      echo "install blobfuse with latest version"
+      pkg_list="${pkg_list} blobfuse"
     else
-      cp /blobfuse-proxy/packages-microsoft-prod-22.04.deb /host/etc/packages-microsoft-prod.deb
+      pkg_list="${pkg_list} blobfuse=${BLOBFUSE_VERSION}"
     fi
-
-    # when running dpkg -i /etc/packages-microsoft-prod.deb, need to enter y to continue. 
-    # refer to https://stackoverflow.com/questions/45349571/how-to-install-deb-with-dpkg-non-interactively
-    yes | $HOST_CMD dpkg -i /etc/packages-microsoft-prod.deb && $HOST_CMD apt update
-
-    pkg_list=""
-    if [ "${INSTALL_BLOBFUSE}" = "true" ] && [ "$(expr "$release" \< "22.04")" -eq 1 ]
-    then
+  fi
+
+  if [ "${INSTALL_BLOBFUSE2}" = "true" ]
+  then
+    if [ "$(expr "$release" \< "22.04")" -eq 1 ]; then
+      echo "install fuse for blobfuse2"
       pkg_list="${pkg_list} fuse"
-      # install blobfuse with latest version or specific version
-      if [ -z "${BLOBFUSE_VERSION}" ]; then
-        echo "install blobfuse with latest version"
-        pkg_list="${pkg_list} blobfuse"
-      else
-        pkg_list="${pkg_list} blobfuse=${BLOBFUSE_VERSION}"
-      fi
+    else
+      echo "install fuse3 for blobfuse2, current release is $release"
+      pkg_list="${pkg_list} fuse3"
     fi
 
-    if [ "${INSTALL_BLOBFUSE2}" = "true" ]
-    then
-      if [ "$(expr "$release" \< "22.04")" -eq 1 ]; then
-        echo "install fuse for blobfuse2"
-        pkg_list="${pkg_list} fuse"
-      else
-        echo "install fuse3 for blobfuse2, current release is $release"
-        pkg_list="${pkg_list} fuse3"
-      fi
-
-      # install blobfuse2 with latest version or specific version
-      if [ -z "${BLOBFUSE2_VERSION}" ]; then
-        echo "install blobfuse2 with latest version"
-        pkg_list="${pkg_list} blobfuse2"
-      else
-        pkg_list="${pkg_list} blobfuse2=${BLOBFUSE2_VERSION}"
-      fi
+    # install blobfuse2 with latest version or specific version
+    if [ -z "${BLOBFUSE2_VERSION}" ]; then
+      echo "install blobfuse2 with latest version"
+      pkg_list="${pkg_list} blobfuse2"
+    else
+      pkg_list="${pkg_list} blobfuse2=${BLOBFUSE2_VERSION}"
     fi
-    echo "begin to install ${pkg_list}"
-    $HOST_CMD apt-get install -y $pkg_list
-    $HOST_CMD rm -f /etc/packages-microsoft-prod.deb
   fi
+  echo "begin to install ${pkg_list}"
+  $HOST_CMD apt-get install -y $pkg_list
+  $HOST_CMD rm -f /etc/packages-microsoft-prod.deb
+fi
 
-  updateBlobfuseProxy="true"
-  if [ -f "/host/usr/bin/blobfuse-proxy" ];then
-    old=$(sha256sum /host/usr/bin/blobfuse-proxy | awk '{print $1}')
-    new=$(sha256sum /blobfuse-proxy/blobfuse-proxy | awk '{print $1}')
-    if [ "$old" = "$new" ];then
-      updateBlobfuseProxy="false"
-      echo "no need to update blobfuse-proxy"
-    fi
+updateBlobfuseProxy="true"
+if [ -f "/host/usr/bin/blobfuse-proxy" ];then
+  old=$(sha256sum /host/usr/bin/blobfuse-proxy | awk '{print $1}')
+  new=$(sha256sum /blobfuse-proxy/blobfuse-proxy | awk '{print $1}')
+  if [ "$old" = "$new" ];then
+    updateBlobfuseProxy="false"
+    echo "no need to update blobfuse-proxy"
   fi
+fi
 
-  if [ "$updateBlobfuseProxy" = "true" ];then
-    echo "copy blobfuse-proxy...."
-    rm -rf /host/var/lib/kubelet/plugins/blob.csi.azure.com/blobfuse-proxy.sock
-    rm -rf /host/usr/bin/blobfuse-proxy
-    cp /blobfuse-proxy/blobfuse-proxy /host/usr/bin/blobfuse-proxy
-    chmod 755 /host/usr/bin/blobfuse-proxy
-  fi
+if [ "$updateBlobfuseProxy" = "true" ];then
+  echo "copy blobfuse-proxy...."
+  rm -rf /host/var/lib/kubelet/plugins/blob.csi.azure.com/blobfuse-proxy.sock
+  rm -rf /host/usr/bin/blobfuse-proxy
+  cp /blobfuse-proxy/blobfuse-proxy /host/usr/bin/blobfuse-proxy
+  chmod 755 /host/usr/bin/blobfuse-proxy
+fi
 
-  updateService="true"
-  if [ -f "/host/usr/lib/systemd/system/blobfuse-proxy.service" ];then
-    old=$(sha256sum /host/usr/lib/systemd/system/blobfuse-proxy.service | awk '{print $1}')
-    new=$(sha256sum /blobfuse-proxy/blobfuse-proxy.service | awk '{print $1}')
-    if [ "$old" = "$new" ];then
-      updateService="false"
-      echo "no need to update blobfuse-proxy.service"
-    fi
+updateService="true"
+if [ -f "/host/usr/lib/systemd/system/blobfuse-proxy.service" ];then
+  old=$(sha256sum /host/usr/lib/systemd/system/blobfuse-proxy.service | awk '{print $1}')
+  new=$(sha256sum /blobfuse-proxy/blobfuse-proxy.service | awk '{print $1}')
+  if [ "$old" = "$new" ];then
+    updateService="false"
+    echo "no need to update blobfuse-proxy.service"
   fi
+fi
 
-  if [ "$updateService" = "true" ];then
-    echo "copy blobfuse-proxy.service...."
-    mkdir -p /host/usr/lib/systemd/system
-    cp /blobfuse-proxy/blobfuse-proxy.service /host/usr/lib/systemd/system/blobfuse-proxy.service
-  fi
+if [ "$updateService" = "true" ];then
+  echo "copy blobfuse-proxy.service...."
+  mkdir -p /host/usr/lib/systemd/system
+  cp /blobfuse-proxy/blobfuse-proxy.service /host/usr/lib/systemd/system/blobfuse-proxy.service
+fi
 
-  if [ "${INSTALL_BLOBFUSE_PROXY}" = "true" ];then
-    if [ "$updateBlobfuseProxy" = "true" ] || [ "$updateService" = "true" ];then
-      echo "start blobfuse-proxy...."
-      $HOST_CMD systemctl daemon-reload
-      $HOST_CMD systemctl enable blobfuse-proxy.service
-      $HOST_CMD systemctl restart blobfuse-proxy.service
-    fi
+if [ "${INSTALL_BLOBFUSE_PROXY}" = "true" ];then
+  if [ "$updateBlobfuseProxy" = "true" ] || [ "$updateService" = "true" ];then
+    echo "start blobfuse-proxy...."
+    $HOST_CMD systemctl daemon-reload
+    $HOST_CMD systemctl enable blobfuse-proxy.service
+    $HOST_CMD systemctl restart blobfuse-proxy.service
   fi
 fi
 

diff --git a/pkg/blobplugin/Dockerfile b/pkg/blobplugin/Dockerfile
@@ -14,15 +14,15 @@
 
 FROM registry.k8s.io/build-image/debian-base:bullseye-v1.4.3
 
-ARG TARGETARCH
-ARG binary=./_output/${TARGETARCH}/blobplugin
+ARG ARCH=amd64
+ARG binary=./_output/${ARCH}/blobplugin
 COPY ${binary} /blobplugin
 
 RUN mkdir /blobfuse-proxy/
 
 COPY ./pkg/blobfuse-proxy/init.sh /blobfuse-proxy/
 COPY ./pkg/blobfuse-proxy/blobfuse-proxy.service /blobfuse-proxy/
-COPY ./_output/${TARGETARCH}/blobfuse-proxy /blobfuse-proxy/
+COPY ./_output/${ARCH}/blobfuse-proxy /blobfuse-proxy/
 
 RUN chmod +x /blobfuse-proxy/init.sh && \
  chmod +x /blobfuse-proxy/blobfuse-proxy.service && \
@@ -35,8 +35,8 @@ RUN if [ "$TARGETARCH" = "amd64" ] ; then \
 else \
   wget -O aznfs.tar.gz https://github.com/Azure/AZNFS-mount/releases/download/1.0.8/aznfs-1.0.8-1.arm64.tar.gz;fi
 RUN tar xvzf aznfs.tar.gz -C / && rm aznfs.tar.gz
-
-RUN if [ "$TARGETARCH" = "amd64" ] ; then \
+ARG ARCH=amd64
+RUN if [ "$ARCH" = "amd64" ] ; then \
   clean-install libcurl4-gnutls-dev && \
   wget -O /blobfuse-proxy/packages-microsoft-prod-22.04.deb https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb && \
   wget -O /blobfuse-proxy/packages-microsoft-prod-18.04.deb https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb && \