fix: make deploy-olm on ARM clusters by mateusoliveira43 · Pull Request #1478 · openshift/oadp-operator

mateusoliveira43 · 2024-07-26T13:21:31Z

Why the changes were made

Allow make deploy-olm to also work in ARM clusters.

Related to openshift/release#54877

How to test the changes made

Run make deploy-olm on ARM and non ARM clusters and create DPA (to test quay images). Both should succeed.

Note: you will need to use unsupported override, since quay images are still not available in ARM architecture.

Signed-off-by: Mateus Oliveira <msouzaol@redhat.com>

openshift-ci · 2024-07-26T13:21:55Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

Signed-off-by: Mateus Oliveira <msouzaol@redhat.com>

weshayutin

whayutin@thinkdoe:/OPENSHIFT/git/OADP/oadp-operator$ oc get node -o jsonpath='{.items[0].status.nodeInfo.operatingSystem}'
linuxwhayutin@thinkdoe:/OPENSHIFT/git/OADP/oadp-operatorget node -o jsonpath='{.items[0].status.nodeInfo.architecture}'ure}'
amd64whayutin@thinkdoe:~/OPENSHIFT/git/OADP/oadp-operator$

kaovilai · 2024-07-29T19:02:53Z

 ifeq ($(shell $(ENVTEST) list | grep $(ENVTEST_K8S_VERSION)),)
-# TODO what --arch=amd64 does here?
 	ENVTESTPATH = $(shell $(ENVTEST) --arch=amd64 use $(ENVTEST_K8S_VERSION) -p path)


In some past version there was an envtest_k8s_version value that would only support amd64 since there's no arm64 artifacts available to download.

mateusoliveira43 · 2024-08-05T15:30:17Z

 # - podman machine ssh sudo rpm-ostree install qemu-user-static && sudo systemctl reboot
 # from: https://github.com/containers/podman/issues/12144#issuecomment-955760527
 # related enhancements that may remove the need to manually install qemu-user-static https://bugzilla.redhat.com/show_bug.cgi?id=2061584
 DOCKER_BUILD_ARGS ?= --platform=linux/amd64


we could pass --platform=linux/amd64,linux/arm64 and have simplified logic, but builds take longer

so, I think is best to use the fastest solution for development environment

kaovilai · 2024-08-05T18:08:06Z

@@ -1,5 +1,7 @@
 # Build the manager binary
 FROM quay.io/konveyor/builder:ubi9-latest AS builder


Suggested change

FROM quay.io/konveyor/builder:ubi9-latest AS builder

FROM --platform=$BUILDPLATFORM quay.io/konveyor/builder:ubi9-latest AS builder

ARG BUILDPLATFORM

kaovilai · 2024-08-06T15:15:27Z

+CLUSTER_OS = $(shell $(OC_CLI) get node -o jsonpath='{.items[0].status.nodeInfo.operatingSystem}' 2> /dev/null)
+CLUSTER_ARCH = $(shell $(OC_CLI) get node -o jsonpath='{.items[0].status.nodeInfo.architecture}' 2> /dev/null)


Followup

Suggested change

CLUSTER_OS = $(shell $(OC_CLI) get node -o jsonpath='{.items[0].status.nodeInfo.operatingSystem}' 2> /dev/null)

CLUSTER_ARCH = $(shell $(OC_CLI) get node -o jsonpath='{.items[0].status.nodeInfo.architecture}' 2> /dev/null)

CLUSTER_OS ?= $(shell $(OC_CLI) get node -o jsonpath='{.items[0].status.nodeInfo.operatingSystem}' 2> /dev/null)

CLUSTER_ARCH ?= $(shell $(OC_CLI) get node -o jsonpath='{.items[0].status.nodeInfo.architecture}' 2> /dev/null)

kaovilai · 2024-08-06T22:59:39Z

/lgtm

openshift-ci · 2024-08-06T23:01:46Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kaovilai, mateusoliveira43, shubham-pampattiwar, weshayutin

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [kaovilai,mateusoliveira43,shubham-pampattiwar]

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

openshift-ci-robot · 2024-08-06T23:43:01Z

/retest-required

Remaining retests: 0 against base HEAD 0a8b70f and 2 for PR HEAD 0fca95f in total

openshift-ci · 2024-08-07T02:06:47Z

@mateusoliveira43: all tests passed!

Full PR test history. Your PR dashboard.

Details

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-sigs/prow repository. I understand the commands that are listed here.

mateusoliveira43 · 2024-08-07T14:23:48Z

/cherry-pick oadp-1.4

openshift-cherrypick-robot · 2024-08-07T14:24:32Z

@mateusoliveira43: new pull request created: #1485

Details

In response to this:

/cherry-pick oadp-1.4

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-sigs/prow repository.

fix: make deploy-olm on ARM clusters

139f4f5

Signed-off-by: Mateus Oliveira <msouzaol@redhat.com>

openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 26, 2024

This comment was marked as outdated.

Sign in to view

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 26, 2024

fixup! fix: make deploy-olm on ARM clusters

0fca95f

Signed-off-by: Mateus Oliveira <msouzaol@redhat.com>

weshayutin approved these changes Jul 29, 2024

View reviewed changes

kaovilai reviewed Jul 29, 2024

View reviewed changes

mateusoliveira43 commented Aug 5, 2024

View reviewed changes

mateusoliveira43 marked this pull request as ready for review August 5, 2024 16:03

openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 5, 2024

openshift-ci Bot requested review from kaovilai and mrnold August 5, 2024 16:04

kaovilai reviewed Aug 5, 2024

View reviewed changes

kaovilai approved these changes Aug 6, 2024

View reviewed changes

kaovilai mentioned this pull request Aug 6, 2024

Allow override of CLUSTER_ARCH in container build #1484

Open

openshift-ci Bot assigned kaovilai Aug 6, 2024

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 6, 2024

shubham-pampattiwar approved these changes Aug 6, 2024

View reviewed changes

openshift-merge-bot Bot merged commit 0532206 into openshift:master Aug 7, 2024

openshift-cherrypick-robot mentioned this pull request Aug 7, 2024

[oadp-1.4] fix: make deploy-olm on ARM clusters #1485

Merged

mateusoliveira43 mentioned this pull request Sep 24, 2024

OADP-3562: Fix controller panic on secret key-value parsing #1529

Merged

kaovilai mentioned this pull request Oct 1, 2024

oadp-1.3: Make deploy-olm work on 4.16 and golang 1.22 built-ins #1441

Closed

		@@ -1,5 +1,7 @@
		# Build the manager binary
		FROM quay.io/konveyor/builder:ubi9-latest AS builder

	FROM quay.io/konveyor/builder:ubi9-latest AS builder
	FROM --platform=$BUILDPLATFORM quay.io/konveyor/builder:ubi9-latest AS builder
	ARG BUILDPLATFORM

		CLUSTER_OS = $(shell $(OC_CLI) get node -o jsonpath='{.items[0].status.nodeInfo.operatingSystem}' 2> /dev/null)
		CLUSTER_ARCH = $(shell $(OC_CLI) get node -o jsonpath='{.items[0].status.nodeInfo.architecture}' 2> /dev/null)

Conversation

mateusoliveira43 commented Jul 26, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Why the changes were made

How to test the changes made

Uh oh!

This comment was marked as outdated.

openshift-ci Bot commented Jul 26, 2024

Uh oh!

weshayutin left a comment

Choose a reason for hiding this comment

Uh oh!

kaovilai Jul 29, 2024

Choose a reason for hiding this comment

Uh oh!

mateusoliveira43 Aug 5, 2024

Choose a reason for hiding this comment

Uh oh!

kaovilai Aug 5, 2024

Choose a reason for hiding this comment

Uh oh!

kaovilai Aug 5, 2024

Choose a reason for hiding this comment

Uh oh!

kaovilai Aug 6, 2024

Choose a reason for hiding this comment

Uh oh!

kaovilai commented Aug 6, 2024

Uh oh!

openshift-ci Bot commented Aug 6, 2024

Uh oh!

openshift-ci-robot commented Aug 6, 2024

Uh oh!

openshift-ci Bot commented Aug 7, 2024

Uh oh!

mateusoliveira43 commented Aug 7, 2024

Uh oh!

openshift-cherrypick-robot commented Aug 7, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

mateusoliveira43 commented Jul 26, 2024 •

edited

Loading