streamline the CCM image build process (#2240)

Signed-off-by: Prajyot-Parab <[email protected]>

Author: Prajyot-Parab

hack/ccm/Dockerfile

@@ -14,8 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG TARGETPLATFORM=linux/amd64
-ARG ARCH=amd64
+ARG TARGETARCH
 
 # Build IBM cloud controller manager binary
 ARG golang_image

hack/ccm/Makefile

@@ -23,31 +23,15 @@ IMG=powervs-cloud-controller-manager
 POWERVS_CLOUD_CONTROLLER_COMMIT?=6256ccf
 TAG?=$(POWERVS_CLOUD_CONTROLLER_COMMIT)
 
-build-image-linux-amd64: init-buildx
+build-image: init-buildx
 	{ \
-        set -e ; \
-        docker buildx build \
-                --build-arg golang_image=$(GO_CONTAINER_IMAGE) \
-                --build-arg TARGETPLATFORM=linux/amd64 --build-arg ARCH=amd64 \
-                --build-arg POWERVS_CLOUD_CONTROLLER_COMMIT=$(POWERVS_CLOUD_CONTROLLER_COMMIT) \
-                -t $(REGISTRY)/$(IMG):$(TAG)_linux_amd64 . --load --target centos-base; \
-        }
-
-build-image-linux-ppc64le: init-buildx
-	{ \
-        set -e ; \
-        docker buildx build \
-                --build-arg golang_image=$(GO_CONTAINER_IMAGE) \
-                --build-arg TARGETPLATFORM=linux/ppc64le --build-arg ARCH=ppc64le \
-                --build-arg POWERVS_CLOUD_CONTROLLER_COMMIT=$(POWERVS_CLOUD_CONTROLLER_COMMIT) \
-                -t $(REGISTRY)/$(IMG):$(TAG)_linux_ppc64le . --load --target centos-base; \
-        }
-
-build-image-and-push-linux-amd64: build-image-linux-amd64
-	docker push $(REGISTRY)/$(IMG):$(TAG)_linux_amd64
-
-build-image-and-push-linux-ppc64le: build-image-linux-ppc64le
-	docker push $(REGISTRY)/$(IMG):$(TAG)_linux_ppc64le
+		set -e ; \
+		docker buildx build \
+			--platform=linux/amd64,linux/ppc64le --pull \
+			--build-arg golang_image=$(GO_CONTAINER_IMAGE) \
+			--build-arg POWERVS_CLOUD_CONTROLLER_COMMIT=$(POWERVS_CLOUD_CONTROLLER_COMMIT) \
+			-t $(REGISTRY)/$(IMG):$(TAG) . --push --target centos-base; \
+    }
 
 init-buildx:
 	# Ensure we use a builder that can leverage it (the default on linux will not)
@@ -57,8 +41,3 @@ init-buildx:
 	# Register gcloud as a Docker credential helper.
 	# Required for "docker buildx build --push".
 	gcloud auth configure-docker --quiet
-
-
-build-and-push-multi-arch: build-image-and-push-linux-amd64 build-image-and-push-linux-ppc64le
-	docker manifest create --amend $(REGISTRY)/$(IMG):$(TAG) $(REGISTRY)/$(IMG):$(TAG)_linux_amd64 $(REGISTRY)/$(IMG):$(TAG)_linux_ppc64le
-	docker manifest push $(REGISTRY)/$(IMG):$(TAG)

hack/ccm/cloudbuild.yaml

@@ -2,15 +2,17 @@
 timeout: 3000s
 options:
   substitution_option: ALLOW_LOOSE
+  machineType: 'E2_HIGHCPU_8'
 steps:
   - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20241111-71c32dbdcc'
     dir: 'hack/ccm'
     entrypoint: make
     env:
       - PULL_BASE_REF=${_PULL_BASE_REF}
       - HOME=/root
+      - DOCKER_BUILDKIT=1
     args:
-      - build-and-push-multi-arch
+      - build-image
 substitutions:
   # _GIT_TAG will be filled with a git-based tag for the image, of the form vYYYYMMDD-hash, and
   # can be used as a substitution