Add cloudbuild configuration to build the image (#124)

Author: rcmadhankumar

Dockerfile

@@ -1,21 +1,32 @@
-#FROM golang:1.15-buster AS builder
-#WORKDIR /go/src/sigs.k8s.io/ibm-powervs-block-csi-driver
-#COPY . .
-#RUN make
+# Copyright 2022 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
-FROM --platform=linux/ppc64le k8s.gcr.io/build-image/debian-base:v2.1.3 AS debian-base
-RUN clean-install ca-certificates e2fsprogs mount udev util-linux xfsprogs
-RUN clean-install bash multipath-tools sg3-utils
-# COPY --from=builder /go/src/sigs.k8s.io/ibm-powervs-block-csi-driver/bin/ibm-powervs-block-csi-driver /bin/ibm-powervs-block-csi-driver
-COPY ./bin/ibm-powervs-block-csi-driver /bin/ibm-powervs-block-csi-driver
+FROM golang:1.17 AS builder
+WORKDIR /go/src/sigs.k8s.io/ibm-powervs-block-csi-driver
+ADD . .
+ARG TARGETPLATFORM
+RUN ARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') make driver
+
+FROM k8s.gcr.io/build-image/debian-base:v2.1.3 AS debian-base
+RUN clean-install ca-certificates e2fsprogs mount udev util-linux xfsprogs bash multipath-tools sg3-utils
+COPY --from=builder /go/src/sigs.k8s.io/ibm-powervs-block-csi-driver /ibm-powervs-block-csi-driver
+ENTRYPOINT ["/ibm-powervs-block-csi-driver"]
 
-ENTRYPOINT ["/bin/ibm-powervs-block-csi-driver"]
 
-FROM --platform=linux/ppc64le registry.access.redhat.com/ubi8/ubi:8.5 AS rhel-base
+FROM registry.access.redhat.com/ubi8/ubi:8.5 AS rhel-base
 RUN yum --disableplugin=subscription-manager -y install httpd php \
   && yum --disableplugin=subscription-manager clean all
 RUN clean-install ca-certificates e2fsprogs mount udev util-linux xfsprogs
-# COPY --from=builder /go/src/sigs.k8s.io/ibm-powervs-block-csi-driver/bin/ibm-powervs-block-csi-driver /bin/ibm-powervs-block-csi-driver
-COPY ./bin/ibm-powervs-block-csi-driver /bin/ibm-powervs-block-csi-driver
-
-ENTRYPOINT ["/bin/ibm-powervs-block-csi-driver"]
+COPY --from=builder /go/src/sigs.k8s.io/ibm-powervs-block-csi-driver /ibm-powervs-block-csi-driver
+ENTRYPOINT ["/ibm-powervs-block-csi-driver"]

Makefile

@@ -13,49 +13,60 @@
 # limitations under the License.
 
 PKG=sigs.k8s.io/ibm-powervs-block-csi-driver
-IMAGE?=quay.io/powercloud/ibm-powervs-block-csi-driver
-VERSION=v0.0.1
-GIT_COMMIT?=$(shell git rev-parse HEAD)
+GIT_COMMIT?=$(shell git rev-parse --short HEAD)
 BUILD_DATE?=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
-LDFLAGS?="-X ${PKG}/pkg/driver.driverVersion=${VERSION} -X ${PKG}/pkg/driver.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/driver.buildDate=${BUILD_DATE} -s -w"
+REGISTRY?=gcr.io/k8s-staging-cloud-provider-ibm
+IMAGE?=ibm-powervs-block-csi-driver
+TAG?=$(GIT_COMMIT)
+LDFLAGS?="-X ${PKG}/pkg/driver.driverVersion=${TAG} -X ${PKG}/pkg/driver.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/driver.buildDate=${BUILD_DATE} -s -w"
 
 GO111MODULE=on
 GOPROXY=direct
 GOPATH=$(shell go env GOPATH)
 GOOS=$(shell go env GOOS)
 GOBIN=$(shell pwd)/bin
 
-PLATFORM=linux/ppc64le
-
-
 .EXPORT_ALL_VARIABLES:
 
 bin:
 	@mkdir -p $@
 
-.PHONY: bin/ibm-powervs-block-csi-driver
-bin/ibm-powervs-block-csi-driver: | bin
-	CGO_ENABLED=0 GOOS=linux GOARCH=ppc64le go build -ldflags ${LDFLAGS} -o bin/ibm-powervs-block-csi-driver ./cmd/
+.PHONY: driver
+bin/ibm-powervs-block-csi-driver:
+driver: | bin
+	CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) go build -ldflags ${LDFLAGS} -o bin/ibm-powervs-block-csi-driver ./cmd/
 
 .PHONY: test
 test:
 	go test -v -race ./cmd/... ./pkg/...
 
-.PHONY: image-release
-image-release:
-	docker buildx build -t $(IMAGE):$(VERSION) . --target debian-base
-
 .PHONY: image
 image:
-	docker build -t $(IMAGE):$(VERSION) . --target debian-base
-
-.PHONY: push-release
-push-release:
-	docker push $(IMAGE):$(VERSION)
+	docker build -t $(REGISTRY)/$(IMAGE):$(TAG) . --target debian-base
 
 .PHONY: push
 push:
-	docker push $(IMAGE):$(VERSION)
+	docker push $(REGISTRY)/$(IMAGE):$(TAG)
+
+build-image-and-push-linux-amd64: init-buildx
+	{                                                                   \
+	set -e ;                                                            \
+	docker buildx build \
+		--build-arg TARGETPLATFORM=linux/amd64 \
+		-t $(REGISTRY)/$(IMAGE):$(TAG)_linux_amd64 --push . --target debian-base; \
+	}
+
+build-image-and-push-linux-ppc64le: init-buildx
+	{                                                                   \
+	set -e ;                                                            \
+	docker buildx build \
+		--build-arg TARGETPLATFORM=linux/ppc64le \
+		-t $(REGISTRY)/$(IMAGE):$(TAG)_linux_ppc64le --push . --target debian-base; \
+	}
+
+build-and-push-multi-arch: build-image-and-push-linux-amd64 build-image-and-push-linux-ppc64le
+	docker manifest create --amend $(REGISTRY)/$(IMAGE):$(TAG) $(REGISTRY)/$(IMAGE):$(TAG)_linux_amd64 $(REGISTRY)/$(IMAGE):$(TAG)_linux_ppc64le
+	docker manifest push -p $(REGISTRY)/$(IMAGE):$(TAG)
 
 .PHONY: clean
 clean:
@@ -83,3 +94,9 @@ verify: verify-vendor
 verify-vendor:
 	@ echo; echo "### $@:"
 	@ ./hack/verify-vendor.sh
+
+init-buildx:
+	# Ensure we use a builder that can leverage it (the default on linux will not)
+	-docker buildx rm multiarch-multiplatform-builder
+	docker buildx create --use --name=multiarch-multiplatform-builder
+	docker run --rm --privileged multiarch/qemu-user-static --reset --credential yes --persistent yes

cloudbuild.yaml

@@ -0,0 +1,18 @@
+# A configuration file for multi-arch image building with the Google cloud build service.
+#
+# See https://github.com/kubernetes/test-infra/blob/master/config/jobs/image-pushing/README.md
+# for more details on image pushing process in Kubernetes.
+
+# This must be specified in seconds. If omitted, defaults to 600s (10 mins).
+timeout: 1200s
+options:
+  substitution_option: ALLOW_LOOSE
+steps:
+  - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20210722-085d930'
+    entrypoint: make
+    env:
+    - PULL_BASE_REF=${_PULL_BASE_REF}
+    - TAG=${_GIT_TAG}
+    - HOME=/root
+    args:
+    - build-and-push-multi-arch