Skip to content

fix(build): Revert "ROX-31023: arm64 support for operator images"#17106

Merged
tommartensen merged 1 commit intomasterfrom
revert-16915-mc/operator-arm64
Oct 2, 2025
Merged

fix(build): Revert "ROX-31023: arm64 support for operator images"#17106
tommartensen merged 1 commit intomasterfrom
revert-16915-mc/operator-arm64

Conversation

@vladbologa
Copy link
Contributor

Reverts #16915 as the change is breaking all Stackrox builds.

@vladbologa vladbologa requested review from a team as code owners October 2, 2025 09:22
@vladbologa vladbologa requested review from porridge and removed request for a team October 2, 2025 09:22
Copy link
Contributor

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey there - I've reviewed your changes - here's some feedback:

  • Double-check that all CI matrix definitions and scripts no longer reference the removed matrix.arch and TARGET_ARCH variables to avoid leftover configuration errors.
  • Validate that switching the operator Dockerfile base image from ubi9 to ubi8 and removing the TARGET_ARCH argument is intentional and compatible with our current build environment.
  • Ensure the removal of push_operator_image and push_operator_manifest_lists in scripts/ci/lib.sh does not leave any dangling invocations elsewhere in the repo.
Prompt for AI Agents
Please address the comments from this code review:

## Overall Comments
- Double-check that all CI matrix definitions and scripts no longer reference the removed `matrix.arch` and `TARGET_ARCH` variables to avoid leftover configuration errors.
- Validate that switching the operator Dockerfile base image from ubi9 to ubi8 and removing the `TARGET_ARCH` argument is intentional and compatible with our current build environment.
- Ensure the removal of `push_operator_image` and `push_operator_manifest_lists` in scripts/ci/lib.sh does not leave any dangling invocations elsewhere in the repo.

## Individual Comments

### Comment 1
<location> `operator/Dockerfile:18` </location>
<code_context>

 # Cache deps before building and copying source so that we don't need to re-download as much and so that source changes
 # don't invalidate our downloaded layer.
-# We're not using `go mod tidy` here because go mod tidy needs to examine _source code_ in order to find unused modules.
+# We're not using `go mod tidy` here becuase go mod tidy needs to examine _source code_ in order to find unused modules.
 # There's no source code in this docker layer yet and so `go mod tidy` would empty go.mod and go.sum which is not what
 # we want. If we're to COPY source before running `go mod tidy`, local docker build times would go up because any code
</code_context>

<issue_to_address>
**nitpick (typo):** Typo: 'becuase' should be 'because'.

```suggestion
# We're not using `go mod tidy` here because go mod tidy needs to examine _source code_ in order to find unused modules.
```
</issue_to_address>

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@vladbologa vladbologa changed the title Revert "ROX-31023: arm64 support for operator images" fix: Revert "ROX-31023: arm64 support for operator images" Oct 2, 2025
@rhacs-bot
Copy link
Contributor

Images are ready for the commit at 36c1ec7.

To use with deploy scripts, first export MAIN_IMAGE_TAG=4.9.x-947-g36c1ec76ff.

@openshift-ci
Copy link

openshift-ci bot commented Oct 2, 2025

@vladbologa: The following tests 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/gke-operator-e2e-tests 36c1ec7 link false /test gke-operator-e2e-tests
ci/prow/gke-ui-e2e-tests 36c1ec7 link true /test gke-ui-e2e-tests
ci/prow/gke-upgrade-tests 36c1ec7 link false /test gke-upgrade-tests
ci/prow/gke-nongroovy-e2e-tests 36c1ec7 link true /test gke-nongroovy-e2e-tests
ci/prow/gke-scanner-v4-install-tests 36c1ec7 link false /test gke-scanner-v4-install-tests
ci/prow/gke-qa-e2e-tests 36c1ec7 link false /test gke-qa-e2e-tests

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.

@vladbologa vladbologa changed the title fix: Revert "ROX-31023: arm64 support for operator images" fix(build): Revert "ROX-31023: arm64 support for operator images" Oct 2, 2025
@vladbologa
Copy link
Contributor Author

/retest

@red-hat-konflux
Copy link
Contributor

Caution

There are some errors in your PipelineRun template.

PipelineRun Error
central-db-on-push CEL expression evaluation error: expression "(\n event == \"push\" && target_branch.matches(\"^(master|release-.*|refs/tags/.*)$\")\n) || (\n event == \"pull_request\" && (\n target_branch.startsWith(\"release-\") ||\n source_branch.matches(\"(konflux|renovate|appstudio|rhtap)\") ||\n (has(body.pull_request.labels) && body.pull_request.labels.exists(l, l.name == \"konflux-build\"))\n ) && body.action != \"ready_for_review\"\n)\n" failed to evaluate: no such key: pull_request
main-on-push CEL expression evaluation error: expression "(\n event == \"push\" && target_branch.matches(\"^(master|release-.*|refs/tags/.*)$\")\n) || (\n event == \"pull_request\" && (\n target_branch.startsWith(\"release-\") ||\n source_branch.matches(\"(konflux|renovate|appstudio|rhtap)\") ||\n (has(body.pull_request.labels) && body.pull_request.labels.exists(l, l.name == \"konflux-build\"))\n ) && body.action != \"ready_for_review\"\n)\n" failed to evaluate: no such key: pull_request
operator-on-push CEL expression evaluation error: expression "(\n event == \"push\" && target_branch.matches(\"^(master|release-.*|refs/tags/.*)$\")\n) || (\n event == \"pull_request\" && (\n target_branch.startsWith(\"release-\") ||\n source_branch.matches(\"(konflux|renovate|appstudio|rhtap)\") ||\n (has(body.pull_request.labels) && body.pull_request.labels.exists(l, l.name == \"konflux-build\"))\n ) && body.action != \"ready_for_review\"\n)\n" failed to evaluate: no such key: pull_request
operator-bundle-on-push CEL expression evaluation error: expression "(\n event == \"push\" && target_branch.matches(\"^(master|release-.*|refs/tags/.*)$\")\n) || (\n event == \"pull_request\" && (\n target_branch.startsWith(\"release-\") ||\n source_branch.matches(\"(konflux|renovate|appstudio|rhtap)\") ||\n (has(body.pull_request.labels) && body.pull_request.labels.exists(l, l.name == \"konflux-build\"))\n ) && body.action != \"ready_for_review\"\n)\n" failed to evaluate: no such key: pull_request
retag-collector CEL expression evaluation error: expression "(\n event == \"push\" && target_branch.matches(\"^(master|release-.*|refs/tags/.*)$\")\n) || (\n event == \"pull_request\" && (\n target_branch.startsWith(\"release-\") ||\n source_branch.matches(\"(konflux|renovate|appstudio|rhtap)\") ||\n (has(body.pull_request.labels) && body.pull_request.labels.exists(l, l.name == \"konflux-build\"))\n ) && body.action != \"ready_for_review\"\n)\n" failed to evaluate: no such key: pull_request
retag-scanner-db-slim CEL expression evaluation error: expression "(\n event == \"push\" && target_branch.matches(\"^(master|release-.*|refs/tags/.*)$\")\n) || (\n event == \"pull_request\" && (\n target_branch.startsWith(\"release-\") ||\n source_branch.matches(\"(konflux|renovate|appstudio|rhtap)\") ||\n (has(body.pull_request.labels) && body.pull_request.labels.exists(l, l.name == \"konflux-build\"))\n ) && body.action != \"ready_for_review\"\n)\n" failed to evaluate: no such key: pull_request
retag-scanner-db CEL expression evaluation error: expression "(\n event == \"push\" && target_branch.matches(\"^(master|release-.*|refs/tags/.*)$\")\n) || (\n event == \"pull_request\" && (\n target_branch.startsWith(\"release-\") ||\n source_branch.matches(\"(konflux|renovate|appstudio|rhtap)\") ||\n (has(body.pull_request.labels) && body.pull_request.labels.exists(l, l.name == \"konflux-build\"))\n ) && body.action != \"ready_for_review\"\n)\n" failed to evaluate: no such key: pull_request
retag-scanner-slim CEL expression evaluation error: expression "(\n event == \"push\" && target_branch.matches(\"^(master|release-.*|refs/tags/.*)$\")\n) || (\n event == \"pull_request\" && (\n target_branch.startsWith(\"release-\") ||\n source_branch.matches(\"(konflux|renovate|appstudio|rhtap)\") ||\n (has(body.pull_request.labels) && body.pull_request.labels.exists(l, l.name == \"konflux-build\"))\n ) && body.action != \"ready_for_review\"\n)\n" failed to evaluate: no such key: pull_request
retag-scanner CEL expression evaluation error: expression "(\n event == \"push\" && target_branch.matches(\"^(master|release-.*|refs/tags/.*)$\")\n) || (\n event == \"pull_request\" && (\n target_branch.startsWith(\"release-\") ||\n source_branch.matches(\"(konflux|renovate|appstudio|rhtap)\") ||\n (has(body.pull_request.labels) && body.pull_request.labels.exists(l, l.name == \"konflux-build\"))\n ) && body.action != \"ready_for_review\"\n)\n" failed to evaluate: no such key: pull_request
roxctl-on-push CEL expression evaluation error: expression "(\n event == \"push\" && target_branch.matches(\"^(master|release-.*|refs/tags/.*)$\")\n) || (\n event == \"pull_request\" && (\n target_branch.startsWith(\"release-\") ||\n source_branch.matches(\"(konflux|renovate|appstudio|rhtap)\") ||\n (has(body.pull_request.labels) && body.pull_request.labels.exists(l, l.name == \"konflux-build\"))\n ) && body.action != \"ready_for_review\"\n)\n" failed to evaluate: no such key: pull_request
scanner-v4-on-push CEL expression evaluation error: expression "(\n event == \"push\" && target_branch.matches(\"^(master|release-.*|refs/tags/.*)$\")\n) || (\n event == \"pull_request\" && (\n target_branch.startsWith(\"release-\") ||\n source_branch.matches(\"(konflux|renovate|appstudio|rhtap)\") ||\n (has(body.pull_request.labels) && body.pull_request.labels.exists(l, l.name == \"konflux-build\"))\n ) && body.action != \"ready_for_review\"\n)\n" failed to evaluate: no such key: pull_request
scanner-v4-db-on-push CEL expression evaluation error: expression "(\n event == \"push\" && target_branch.matches(\"^(master|release-.*|refs/tags/.*)$\")\n) || (\n event == \"pull_request\" && (\n target_branch.startsWith(\"release-\") ||\n source_branch.matches(\"(konflux|renovate|appstudio|rhtap)\") ||\n (has(body.pull_request.labels) && body.pull_request.labels.exists(l, l.name == \"konflux-build\"))\n ) && body.action != \"ready_for_review\"\n)\n" failed to evaluate: no such key: pull_request

@codecov
Copy link

codecov bot commented Oct 2, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 48.78%. Comparing base (fb1a5e7) to head (36c1ec7).

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #17106   +/-   ##
=======================================
  Coverage   48.78%   48.78%           
=======================================
  Files        2712     2712           
  Lines      202407   202407           
=======================================
+ Hits        98750    98753    +3     
+ Misses      95874    95870    -4     
- Partials     7783     7784    +1     
Flag Coverage Δ
go-unit-tests 48.78% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@tommartensen tommartensen merged commit daa25a2 into master Oct 2, 2025
88 of 99 checks passed
@tommartensen tommartensen deleted the revert-16915-mc/operator-arm64 branch October 2, 2025 12:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants