Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Feb 17, 2026
+27 −4
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 27 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,12 +392,30 @@ endif
# Catalog source name for deploy-olm
CATALOG_SOURCE_NAME ?= oadp-operator-catalog

# Build a catalog image by adding bundle images to an empty catalog using the operator package manager tool, 'opm'.
# This recipe invokes 'opm' in 'semver' bundle add mode. For more information on add modes, see:
# https://github.com/operator-framework/community-operators/blob/7f1438c/docs/packaging-operator.md#updating-your-existing-operator
# Build a catalog image using file-based catalog (FBC) format.
# This renders bundle images into a declarative config, adds a channel entry,
# validates the catalog, and builds a container image with proper platform support.
# The FBC approach replaces the deprecated sqlite-based 'opm index add' method
# and ensures correct multi-arch builds via $(DOCKER_BUILD_ARGS).
.PHONY: catalog-build
catalog-build: opm ## Build a catalog image.
$(OPM) index add --container-tool $(CONTAINER_TOOL) --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
rm -rf catalog.Dockerfile catalog/
mkdir -p catalog/oadp-operator
$(OPM) render $(BUNDLE_IMGS) -o yaml > catalog/oadp-operator/index.yaml
@echo "---" >> catalog/oadp-operator/index.yaml
@echo "schema: olm.package" >> catalog/oadp-operator/index.yaml
@echo "name: oadp-operator" >> catalog/oadp-operator/index.yaml
@echo "defaultChannel: $(DEFAULT_CHANNEL)" >> catalog/oadp-operator/index.yaml
@echo "---" >> catalog/oadp-operator/index.yaml
@echo "schema: olm.channel" >> catalog/oadp-operator/index.yaml
@echo "name: $(DEFAULT_CHANNEL)" >> catalog/oadp-operator/index.yaml
@echo "package: oadp-operator" >> catalog/oadp-operator/index.yaml
@echo "entries:" >> catalog/oadp-operator/index.yaml
@echo " - name: oadp-operator.v$(VERSION)" >> catalog/oadp-operator/index.yaml
$(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/

# Push the catalog image.
.PHONY: catalog-push
Expand Down Expand Up @@ -566,7 +584,12 @@ deploy-olm: undeploy-olm ## Build current branch operator image, bundle image, p
done; \
if [ $$timeout -le 0 ]; then \
echo "Timeout waiting for CatalogSource"; \
echo "=== CatalogSource status ==="; \
$(OC_CLI) get catalogsource $(CATALOG_SOURCE_NAME) -n $(OADP_TEST_NAMESPACE) -o yaml; \
echo "=== Catalog pod status ==="; \
$(OC_CLI) get pods -n $(OADP_TEST_NAMESPACE) -l olm.catalogSource=$(CATALOG_SOURCE_NAME) 2>/dev/null || true; \
echo "=== Catalog pod logs ==="; \
$(OC_CLI) logs -n $(OADP_TEST_NAMESPACE) -l olm.catalogSource=$(CATALOG_SOURCE_NAME) --tail=50 2>/dev/null || true; \
exit 1; \
fi
# Create OperatorGroup if not exists
Expand Down