OCPBUGS-104542: force same arch for opm and catalogsource pod for multiarch tests

[ankitathomas]

OpenShift BuildConfigs create single arch images even with a multi-arch source. The opm image created by the BuildConfig will thus match whatever arch the build environment is. In a multi-arch cluster, this arch may differ from the arch of the node the catalogsource pod gets deployed in with the newly built test catalog.

This PR forces both the BuildConfig and CatalogSource pods to use the same arch. This requirement will prevent this arch mismatch between catalogsource build environment and runtime environment.

Summary by CodeRabbit

• Bug Fixes

  • Improved Kubernetes catalog and custom schema builds for architecture-specific environments.
  • Automatically detects the host architecture and schedules related workloads on compatible nodes.
  • Added architecture configuration to catalog sources and build processes, reducing deployment failures on non-default architectures.

• Tests

  • Expanded validation coverage to confirm architecture-aware catalog and custom schema workflows.

[openshift-ci-robot]

@ankitathomas: This pull request references Jira Issue OCPBUGS-104542, which is invalid:

• expected the bug to target the "5.0.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

OpenShift BuildConfigs create single arch images even with a multi-arch source. The opm image created by the BuildConfig will thus match whatever arch the build environment is. In a multi-arch cluster, this arch may differ from the arch of the node the catalogsource pod gets deployed in with the newly built test catalog.

This PR forces both the BuildConfig and CatalogSource pods to use the same arch. This requirement will prevent this arch mismatch between catalogsource build environment and runtime environment.

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 openshift-eng/jira-lifecycle-plugin repository.

[coderabbitai]

Walkthrough

The changes detect the host architecture and pass it through OLM test utilities into CatalogSource and BuildConfig templates. The templates use the architecture for Kubernetes node selection.

Changes

OLM architecture support

Layer / File(s)	Summary
Architecture-aware resource templates tests-extension/test/qe/testdata/olm/catalogsource-image.yaml, tests-extension/test/qe/testdata/olm/custom-schema-buildconfig.yaml, tests-extension/pkg/bindata/qe/bindata.go	The CatalogSource gRPC pod and custom schema BuildConfig use kubernetes.io/arch: "${ARCH}". Both templates declare the ARCH parameter.
Architecture propagation in OLM utilities tests-extension/test/qe/util/olmv0util/catalog_source.go, tests-extension/test/qe/util/olmv0util/custom_schema_grpc.go	CatalogSourceDescription adds Arch. CatalogSource creation and custom catalog image builds default empty architecture values to runtime.GOARCH and pass ARCH to their templates.
Architecture-aware test setup tests-extension/test/qe/specs/olmv0_custom_schema.go	The test detects and logs runtime.GOARCH, passes it to BuildCustomCatalogImage, and sets the CatalogSource architecture.

Estimated code review effort: 2 (Simple) | ~10 minutes

🚥 Pre-merge checks | ✅ 14 | ❌ 1

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Test Structure And Quality	⚠️ Warning	The changed Ginkgo test and helpers contain several bare Expect(err).NotTo(HaveOccurred()) assertions, including file-read, gRPC, and resource operations, without diagnostic messages.	Add meaningful context to every error assertion, such as the operation and resource or query that failed; also keep failure diagnostics specific to each cluster operation.

✅ Passed checks (14 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title clearly summarizes the main change: aligning the architectures of the OPM build and CatalogSource pod for multi-architecture tests.
Docstring Coverage	✅ Passed	Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names	✅ Passed	The patch adds no Ginkgo title and leaves only static Describe/It strings; runtime.GOARCH is used in the test body and logs.
Microshift Test Compatibility	✅ Passed	No new Ginkgo test was added. The existing OLM test remains guarded by exutil.SkipMicroshift, which calls g.Skip on MicroShift.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	The commit adds no new Ginkgo test declarations. It only adds architecture node selectors to an existing test, with no multi-node or HA assumptions.
Topology-Aware Scheduling Compatibility	✅ Passed	The changes add only kubernetes.io/arch selectors to test BuildConfig and CatalogSource pods; they do not target control-plane/worker roles or add topology, replica, affinity, taint, or PDB constra...
Ote Binary Stdout Contract	✅ Passed	The PR adds only runtime.GOARCH handling and e2e.Logf calls; those logs use GinkgoWriter, while main and AddBeforeAll setup contain no stdout writes.
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	The patch adds no Ginkgo test declarations, IPv4 literals, or external connections. The existing 127.0.0.1 port-forward code is unchanged, and new image access uses the cluster registry.
No-Weak-Crypto	✅ Passed	The PR adds architecture selection only; scans of added lines and modified Go files found no weak crypto primitives, crypto APIs, custom crypto, or secret comparisons.
Container-Privileges	✅ Passed	The HEAD diff adds only architecture nodeSelector fields, ARCH parameters, and Go plumbing; it adds no privileged, hostPID, hostNetwork, hostIPC, SYS_ADMIN, root, or allowPrivilegeEscalation settings.
No-Sensitive-Data-In-Logs	✅ Passed	New logs expose only runtime.GOARCH architecture; the BuildConfig log retains the existing base-image value and adds architecture. No passwords, tokens, keys, PII, or customer data are newly logged.

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

_{Comment @coderabbitai help to get the list of available commands.}

[coderabbitai]

Actionable comments posted: 2

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@tests-extension/test/qe/specs/olmv0_custom_schema.go`:
- Line 60: Move both cleanup registrations using dr.GetIr(itName).Add(...) to
immediately before the BuildCustomCatalogImage call in the test setup, so the
ImageStream and BuildConfig are registered before creation begins. Keep the
existing registrations and BuildCustomCatalogImage arguments unchanged.

In `@tests-extension/test/qe/util/olmv0util/custom_schema_grpc.go`:
- Line 143: Update the e2e.Logf call that reports the created BuildConfig so it
no longer includes the full baseImage reference; log only the namespace/name and
architecture, or use an established redaction helper to remove the registry
hostname before logging.

🪄 Autofix

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: aa17c79e-07c5-42c4-9aa1-878c8702cf7b

📥 Commits

Reviewing files that changed from the base of the PR and between 7687017 and 19d8240.

📒 Files selected for processing (6)

• tests-extension/pkg/bindata/qe/bindata.go
• tests-extension/test/qe/specs/olmv0_custom_schema.go
• tests-extension/test/qe/testdata/olm/catalogsource-image.yaml
• tests-extension/test/qe/testdata/olm/custom-schema-buildconfig.yaml
• tests-extension/test/qe/util/olmv0util/catalog_source.go
• tests-extension/test/qe/util/olmv0util/custom_schema_grpc.go

[openshift-ci]

@ankitathomas: 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.

[ankitathomas]

/jira refresh

[openshift-ci-robot]

@ankitathomas: This pull request references Jira Issue OCPBUGS-104542, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (5.0.0) matches configured target version for branch (5.0.0)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Details

In response to this:

/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

[tmshort]

/approve

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ankitathomas, tmshort

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:

• DOWNSTREAM_OWNERS [tmshort]

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