Added support for s390x and ppc64le for multi-arch image build #956

satyamg1620 · 2024-04-05T06:58:36Z

Description

For creating multi-arch build image, use command make docker-buildx. For creating bundle build multi-arch image, use command make bundle-docker-build. Above commands build multi-arch images and will push into your provided image registry.

How Has This Been Tested?

This has been tested by deploying the build images on openshift cluster and the Opendatahub operator is running up successfully. Our openshift cluster is running upon s390x architecture, so we have used corresponding image generated by the commands provided in Description section. Our changes will not affect other areas of the code. It is just adding support for s390x and ppc64le for multi-arch image build

Merge criteria:

The commits are squashed in a cohesive manner and have meaningful messages.
Testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
The developer has manually tested the changes and verified that the changes work

openshift-ci · 2024-04-05T06:58:44Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign lavlas for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci · 2024-04-05T06:58:48Z

Hi @satyamg1620. Thanks for your PR.

I'm waiting for a opendatahub-io member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

satyamg1620 · 2024-04-10T05:09:56Z

@zdtsw , can you please add the required reviewers for this PR?

zdtsw · 2024-04-10T06:35:50Z

@zdtsw , can you please add the required reviewers for this PR?

@satyamg1620 previous 2 auto assigned reviewers were wrongly added, thus I removed them from the list.
we are still internally discussing how to deal with multi-arch requests before we start code review process.

satyamg1620 · 2024-04-12T05:29:09Z

@zdtsw , can you please provide update ?

ykaliuta · 2024-04-12T06:50:51Z

Makefile

+.PHONY: docker-buildx
+docker-buildx: ## Build and push docker image for the manager for cross-platform support
+	# copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile
+	sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' ./Dockerfiles/Dockerfile > ./Dockerfiles/Dockerfile.cross


Do you want to replace all ^FROM with FROM --platform=${BUILDPLATFORM} here?

ykaliuta · 2024-04-12T06:51:59Z

Makefile

+
+.PHONY: bundle-docker-buildx
+bundle-docker-buildx: ## Build and push docker image for the manager for cross-platform support
+	# copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile


Move the recipe to a variable. (Different --tag, so probably, a function)

I agree to this.

@ykaliuta Can you please verify the changes as requested?

ykaliuta · 2024-04-12T06:58:08Z

Makefile

+PLATFORMS ?= linux/amd64,linux/s390x,linux/ppc64le
+.PHONY: docker-buildx
+docker-buildx: ## Build and push docker image for the manager for cross-platform support
+	# copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile


Is it possible to have universal Dockerfile for both types of builds?

We have tried to use the same Dockerfile for all platform & only use buildx to invoke it with different platform . So Dockerfile is generic. Dockerfile.cross is generated just to handle the platform option passed as a run type argument during buildx command execution. Once its job is done , we are deleting Dockerfile.cross & maintaining only single Dockerfile

ykaliuta · 2024-04-12T07:01:03Z

Makefile

+PLATFORMS ?= linux/amd64,linux/s390x,linux/ppc64le
+.PHONY: docker-buildx
+docker-buildx: ## Build and push docker image for the manager for cross-platform support
+	# copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile


Make Dockerfile.cross target and dependency of it.

Since its generated on the fly & removed after execution , i don't understand the use of keeping it as target.

ykaliuta · 2024-04-12T07:02:09Z

Makefile

+docker-buildx: ## Build and push docker image for the manager for cross-platform support
+	# copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile
+	sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' ./Dockerfiles/Dockerfile > ./Dockerfiles/Dockerfile.cross
+	- docker buildx create --name project-v3-builder


Probably makes sense to have BUILDX_BILDER or something.

buildx is an idle solution for multicross platform build & push operation with minimal code change

satyamg1620 · 2024-04-17T03:47:36Z