Merge pull request #397 from andyzhangx/arm64

chore: refactor Makefile

Author: andyzhangx

Makefile

@@ -40,6 +40,12 @@ GOBIN ?= $(GOPATH)/bin
 DOCKER_CLI_EXPERIMENTAL = enabled
 export GOPATH GOBIN GO111MODULE DOCKER_CLI_EXPERIMENTAL
 
+# Output type of docker buildx build
+OUTPUT_TYPE ?= registry
+
+ALL_ARCH.linux = amd64 #arm64
+ALL_OS_ARCH = $(foreach arch, ${ALL_ARCH.linux}, linux-$(arch))
+
 all: blob
 
 .PHONY: verify
@@ -85,7 +91,7 @@ e2e-teardown:
 
 .PHONY: blob
 blob:
-	CGO_ENABLED=0 GOOS=linux 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/blobplugin ./pkg/blobplugin
 
 .PHONY: blob-windows
 blob-windows:
@@ -99,36 +105,41 @@ blob-darwin:
 container: blob
 	docker build -t $(IMAGE_TAG) -f ./pkg/blobplugin/dev.Dockerfile .
 
+.PHONY: container-linux
+container-linux:
+	docker buildx build --pull --output=type=$(OUTPUT_TYPE) --platform="linux/$(ARCH)" \
+		-t $(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
-ifdef CI
+
 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
-	docker buildx build --no-cache --build-arg LDFLAGS=${LDFLAGS} -t $(IMAGE_TAG) -f ./pkg/blobplugin/Dockerfile --platform="linux/amd64" --push .
-
-	docker manifest create $(IMAGE_TAG) $(IMAGE_TAG)
-	docker manifest inspect $(IMAGE_TAG)
-ifdef PUBLISH
-	docker manifest create $(IMAGE_TAG_LATEST) $(IMAGE_TAG)
-	docker manifest inspect $(IMAGE_TAG_LATEST)
-endif
-endif
+	# enable qemu for arm64 build
+	# docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+	for arch in $(ALL_ARCH.linux); do \
+		ARCH=$${arch} $(MAKE) blob; \
+		ARCH=$${arch} $(MAKE) container-linux; \
+	done
 
 .PHONY: push
 push:
 ifdef CI
+	docker manifest create --amend $(IMAGE_TAG) $(foreach osarch, $(ALL_OS_ARCH), $(IMAGE_TAG)-${osarch})
 	docker manifest push --purge $(IMAGE_TAG)
+	docker manifest inspect $(IMAGE_TAG)
 else
 	docker push $(IMAGE_TAG)
 endif
 
 .PHONY: push-latest
 push-latest:
 ifdef CI
-	docker manifest push --purge $(IMAGE_TAG_LATEST)
+	docker manifest create --amend $(IMAGE_TAG_LATEST) $(foreach osarch, $(ALL_OS_ARCH), $(IMAGE_TAG)-${osarch})
+	docker manifest inspect $(IMAGE_TAG_LATEST)
 else
 	docker push $(IMAGE_TAG_LATEST)
 endif

pkg/blob/nodeserver.go

@@ -93,6 +93,7 @@ func (d *Driver) NodePublishVolume(ctx context.Context, req *csi.NodePublishVolu
 
 	klog.V(2).Infof("NodePublishVolume: volume %s mounting %s at %s with mountOptions: %v", volumeID, source, target, mountOptions)
 	if d.enableBlobMockMount {
+		klog.Warningf("NodePublishVolume: mock mount on volumeID(%s), this is only for TESTING!!!", volumeID)
 		if err := volumehelper.MakeDir(target); err != nil {
 			klog.Errorf("MakeDir failed on target: %s (%v)", target, err)
 			return nil, err

pkg/blobplugin/Dockerfile

@@ -12,22 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.16.3-alpine3.13 as builder
-WORKDIR /go/src/sigs.k8s.io/blob-csi-driver
-ADD . .
-ARG TARGETARCH
-ARG TARGETOS
-ARG LDFLAGS
-RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -a -ldflags "${LDFLAGS:--X sigs.k8s.io/blob-csi-driver/pkg/blob.driverVersion=latest}" -mod vendor -o _output/blobplugin ./pkg/blobplugin
+ARG ARCH
 
-FROM k8s.gcr.io/build-image/debian-base-amd64:v2.1.3
-COPY --from=builder /go/src/sigs.k8s.io/blob-csi-driver/_output/blobplugin /blobplugin
+FROM k8s.gcr.io/build-image/debian-base-${ARCH}:v2.1.3
+COPY ./_output/blobplugin /blobplugin
 RUN apt-get update && clean-install ca-certificates pkg-config libfuse-dev cmake libcurl4-gnutls-dev libgnutls28-dev uuid-dev libgcrypt20-dev wget
 RUN wget -O /tmp/packages-microsoft-prod.deb https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb && dpkg -i /tmp/packages-microsoft-prod.deb && apt-get update && apt install blobfuse fuse -y && rm -f /tmp/packages-microsoft-prod.deb
 RUN apt remove wget -y
 # this is a workaround to install nfs-common & nfs-kernel-server and don't quit with error
-# WIP: check if updating the kernel version would fix the below error
-# RUN apt update && apt install nfs-common nfs-kernel-server -y || true
+RUN apt-get update && apt install nfs-common nfs-kernel-server -y || true
 LABEL maintainers="andyzhangx"
 LABEL description="Azure Blob Storage CSI driver"