Skip to content

update makefile on oadp-dev to work with arm64#2084

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:oadp-devfrom
weshayutin:arm64opm
Feb 17, 2026
Merged

update makefile on oadp-dev to work with arm64#2084
openshift-merge-bot[bot] merged 1 commit intoopenshift:oadp-devfrom
weshayutin:arm64opm

Conversation

@weshayutin
Copy link
Contributor

@weshayutin weshayutin commented Feb 10, 2026

fixes

fixes issue: 2083

Why the changes were made

  • need to check we're using opm appropriately
  • works on arm

How to test the changes made

$(OPM) validate catalog/
	$(OPM) generate dockerfile catalog/ --binary-image=quay.io/operator-framework/opm:$(OPM_VERSION)
	$(CONTAINER_TOOL) build --load $(DOCKER_BUILD_ARGS) -f catalog.Dockerfile -t $(CATALOG_IMG) .
	rm -rf catalog.Dockerfile catalog/

The key fix is that the docker build command now uses $(DOCKER_BUILD_ARGS) which includes --platform=linux/arm64 for this ARM64 cluster, ensuring the catalog image contains the correct architecture opm binary.

make deploy-olm on arm64 cluster.

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Feb 10, 2026

Walkthrough

Makefile changes update the catalog-build target to use file-based catalog (FBC) generation instead of opm index add semver, explicitly push catalog images via docker-push in the catalog-push target, and enhance deploy-olm timeout diagnostics with CatalogSource and pod logs.

Changes

Cohort / File(s) Summary
Catalog Build & Push
Makefile
catalog-build target refactored to generate file-based catalog by rendering bundles to index.yaml, appending metadata, validating, generating dockerfile, and building image; catalog-push target updated to explicitly push via docker-push.
Deployment Diagnostics
Makefile
deploy-olm timeout wait logic enhanced to print CatalogSource YAML, catalog pod status, and pod logs before exit on timeout failure.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

✨ Finishing touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment

No actionable comments were generated in the recent review. 🎉


Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 10, 2026
@openshift-ci
Copy link

openshift-ci bot commented Feb 10, 2026

@weshayutin: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/4.22-e2e-test-aws ccbbd51 link false /test 4.22-e2e-test-aws

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.

Copy link
Member

@shubham-pampattiwar shubham-pampattiwar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 16, 2026
@openshift-ci
Copy link

openshift-ci bot commented Feb 16, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kaovilai, 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,shubham-pampattiwar]

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

@kaovilai
Copy link
Member

/override ci/prow/4.21-e2e-test-aws

@kaovilai
Copy link
Member

/override ci/prow/4.21-e2e-test-aws

@openshift-ci
Copy link

openshift-ci bot commented Feb 16, 2026

@kaovilai: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

  • [ci/prow/4.21-e2e-test-aws](https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_oadp-operator/2084/pull-ci-openshift-oadp-operator-oadp-dev-4.21-e2e-test-aws/2021016012001906688)

Only the following failed contexts/checkruns were expected:

  • CodeRabbit
  • ci/prow/4.21-ci-index
  • ci/prow/4.21-e2e-test-aws
  • ci/prow/4.21-e2e-test-cli-aws
  • ci/prow/4.21-e2e-test-hcp-aws
  • ci/prow/4.21-e2e-test-kubevirt-aws
  • ci/prow/4.21-images
  • ci/prow/4.22-ci-index
  • ci/prow/4.22-e2e-test-aws
  • ci/prow/4.22-images
  • ci/prow/5.0-ci-index
  • ci/prow/5.0-images
  • ci/prow/images
  • ci/prow/unit-test
  • pull-ci-openshift-oadp-operator-oadp-1.0-images
  • pull-ci-openshift-oadp-operator-oadp-1.0-unit-test
  • pull-ci-openshift-oadp-operator-oadp-dev-4.21-ci-index
  • pull-ci-openshift-oadp-operator-oadp-dev-4.21-e2e-test-aws
  • pull-ci-openshift-oadp-operator-oadp-dev-4.21-e2e-test-cli-aws
  • pull-ci-openshift-oadp-operator-oadp-dev-4.21-e2e-test-hcp-aws
  • pull-ci-openshift-oadp-operator-oadp-dev-4.21-e2e-test-kubevirt-aws
  • pull-ci-openshift-oadp-operator-oadp-dev-4.21-images
  • pull-ci-openshift-oadp-operator-oadp-dev-4.22-ci-index
  • pull-ci-openshift-oadp-operator-oadp-dev-4.22-e2e-test-aws
  • pull-ci-openshift-oadp-operator-oadp-dev-4.22-images
  • pull-ci-openshift-oadp-operator-oadp-dev-5.0-ci-index
  • pull-ci-openshift-oadp-operator-oadp-dev-5.0-images
  • tide

If you are trying to override a checkrun that has a space in it, you must put a double quote on the context.

Details

In response to this:

/override ci/prow/4.21-e2e-test-aws

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.

@openshift-ci
Copy link

openshift-ci bot commented Feb 16, 2026

@kaovilai: Overrode contexts on behalf of kaovilai: ci/prow/4.21-e2e-test-aws

Details

In response to this:

/override ci/prow/4.21-e2e-test-aws

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.

@openshift-merge-bot openshift-merge-bot bot merged commit 304752e into openshift:oadp-dev Feb 17, 2026
14 of 15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants