NO-JIRA: align control-plane Dockerfile builder image with main Dockerfile by redhat-chai-bot · Pull Request #9138 · openshift/hypershift

redhat-chai-bot · 2026-07-28T09:18:37Z

Summary

Align the builder base image in Dockerfile.control-plane with the one used in the main Dockerfile to fix arm64 build failures.

Details

The Dockerfile.control-plane (which builds the hypershift image) was using registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.23 as its builder stage base image. This image lacks a proper arm64 manifest, causing all arm64 builds to fail with:

exec /bin/sh: exec format error

The main Dockerfile (which builds hypershift-operator) uses registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.23, which has working multi-arch support including arm64.

This PR aligns Dockerfile.control-plane to use the same builder image, fixing the arm64 build failures that are blocking all e2e CI jobs.

Change

Dockerfile.control-plane: Change builder FROM image from ocp/builder:rhel-9-golang-1.25-openshift-4.23 to openshift/release:rhel-9-release-golang-1.25-openshift-4.23

@csrwng requested in Slack thread

Summary by CodeRabbit

Chores
- Updated the control-plane build environment to use the latest OpenShift Go tooling image.
- No changes to runtime behavior, included components, startup configuration, or operator metadata.

…ckerfile Switch Dockerfile.control-plane FROM line to use the openshift/release base image, which has proper arm64 manifest support, fixing exec format errors on arm64 builds. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

openshift-merge-bot · 2026-07-28T09:18:39Z

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

openshift-ci · 2026-07-28T09:18:52Z

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

coderabbitai · 2026-07-28T09:18:59Z

📝 Walkthrough

Walkthrough

The control-plane Dockerfile’s builder stage now uses registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.23 instead of the previous OCP builder image. Subsequent build steps, runtime image, binaries, entrypoint, and operator labels are unchanged.

🚥 Pre-merge checks | ✅ 11

✅ Passed checks (11 passed)

Check name	Status	Explanation
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	Only Dockerfile.control-plane changed; no Ginkgo tests or test titles were added or modified.
Test Structure And Quality	✅ Passed	Only Dockerfile.control-plane changed; no Ginkgo test files or test code were modified, so the test-quality check is not applicable.
Topology-Aware Scheduling Compatibility	✅ Passed	Only Dockerfile.control-plane changed, swapping the builder image; no scheduling constraints, replicas, affinity, or node selectors were added.
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	Only Dockerfile.control-plane changed; no Ginkgo tests or networking code were added or modified.
No-Weak-Crypto	✅ Passed	Only change is swapping the Dockerfile builder base image; no weak crypto, custom crypto, or secret comparisons are present in the diff.
Container-Privileges	✅ Passed	Only Dockerfile.control-plane changed; it swaps the builder image and adds no privileged/root/host* or allowPrivilegeEscalation settings.
No-Sensitive-Data-In-Logs	✅ Passed	The only change is a builder-image FROM line in Dockerfile.control-plane; no logging code or sensitive-data outputs were added.
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title accurately describes the main change: aligning the control-plane Dockerfile builder image with the main Dockerfile.

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

coderabbitai

Actionable comments posted: 1

🤖 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 `@Dockerfile.control-plane`:
- Line 1: Add a supported non-root USER directive, such as UID 1001, in the
runtime stage before ENTRYPOINT. Ensure the final container image does not
default to root while leaving the builder stage unchanged.

🪄 Autofix (Beta)

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 YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: 5acafbe7-e67d-440c-b3af-7d48f0e0dc78

📥 Commits

Reviewing files that changed from the base of the PR and between fe62283 and 89d4a30.

📒 Files selected for processing (1)

Dockerfile.control-plane

jparrill · 2026-07-28T09:21:55Z

/area ci-tooling

jparrill · 2026-07-28T09:22:09Z

/retitle NO-JIRA: align control-plane Dockerfile builder image with main Dockerfile

openshift-ci-robot · 2026-07-28T09:22:16Z

@redhat-chai-bot: This pull request explicitly references no jira issue.

Details

In response to this:

Summary

Align the builder base image in Dockerfile.control-plane with the one used in the main Dockerfile to fix arm64 build failures.

Details

The Dockerfile.control-plane (which builds the hypershift image) was using registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.23 as its builder stage base image. This image lacks a proper arm64 manifest, causing all arm64 builds to fail with:
exec /bin/sh: exec format error
The main Dockerfile (which builds hypershift-operator) uses registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.23, which has working multi-arch support including arm64.

This PR aligns Dockerfile.control-plane to use the same builder image, fixing the arm64 build failures that are blocking all e2e CI jobs.

Change

Dockerfile.control-plane: Change builder FROM image from ocp/builder:rhel-9-golang-1.25-openshift-4.23 to openshift/release:rhel-9-release-golang-1.25-openshift-4.23

@csrwng requested in Slack thread

Summary by CodeRabbit

Chores

Updated the control-plane build environment to use the latest OpenShift Go tooling image.

No changes to runtime behavior, included components, startup configuration, or operator metadata.

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.

jparrill · 2026-07-28T09:22:17Z

/label acknowledge-critical-fixes-only

jparrill · 2026-07-28T09:22:26Z

/ok-to-test

codecov · 2026-07-28T09:26:53Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 44.56%. Comparing base (fe62283) to head (89d4a30).

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #9138   +/-   ##
=======================================
  Coverage   44.56%   44.56%           
=======================================
  Files         774      774           
  Lines       97003    97003           
=======================================
  Hits        43228    43228           
  Misses      50783    50783           
  Partials     2992     2992

Flag	Coverage Δ
cmd-support	`38.39% <ø> (ø)`
cpo-hostedcontrolplane	`47.22% <ø> (ø)`
cpo-other	`45.25% <ø> (ø)`
hypershift-operator	`54.46% <ø> (ø)`
other	`33.07% <ø> (ø)`

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

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

jparrill · 2026-07-28T09:28:33Z

/test images

csrwng · 2026-07-28T09:29:51Z

/lgtm

openshift-merge-bot · 2026-07-28T09:30:06Z

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aks
/test e2e-aws
/test e2e-aws-upgrade-hypershift-operator
/test e2e-azure-v2-self-managed
/test e2e-kubevirt-aws-ovn-reduced
/test e2e-v2-aws
/test e2e-v2-gke
/test unit
/test verify

jparrill · 2026-07-28T09:31:53Z

/verified by e2e

jparrill · 2026-07-28T09:32:05Z

/approve

openshift-ci-robot · 2026-07-28T09:32:05Z

@jparrill: This PR has been marked as verified by e2e.

Details

In response to this:

/verified by e2e

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.

openshift-ci · 2026-07-28T09:43:19Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: csrwng, jparrill, redhat-chai-bot

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~~ [csrwng,jparrill]

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

openshift-ci Bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/needs-area labels Jul 28, 2026

coderabbitai Bot reviewed Jul 28, 2026

View reviewed changes

Comment thread Dockerfile.control-plane

openshift-ci Bot added area/ci-tooling Indicates the PR includes changes for CI or tooling and removed do-not-merge/needs-area labels Jul 28, 2026

openshift-ci Bot changed the title ~~fix(build): align control-plane Dockerfile builder image with main Dockerfile~~ NO-JIRA: align control-plane Dockerfile builder image with main Dockerfile Jul 28, 2026

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 28, 2026

openshift-ci Bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Jul 28, 2026

csrwng marked this pull request as ready for review July 28, 2026 09:22

openshift-ci Bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Jul 28, 2026

openshift-ci Bot requested review from csrwng and enxebre July 28, 2026 09:22

openshift-ci Bot assigned csrwng Jul 28, 2026

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 28, 2026

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jul 28, 2026

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

csrwng approved these changes Jul 28, 2026

View reviewed changes

jparrill mentioned this pull request Jul 28, 2026

OCPBUGS-99898: Add unit test for aggregateMachineMessages truncation logic #9128

Open

4 tasks

csrwng merged commit a714699 into openshift:main Jul 28, 2026
27 of 35 checks passed

Uh oh!

Conversation

redhat-chai-bot commented Jul 28, 2026 • edited by coderabbitai Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Details

Change

Summary by CodeRabbit

Uh oh!

openshift-merge-bot Bot commented Jul 28, 2026

Uh oh!

openshift-ci Bot commented Jul 28, 2026

Uh oh!

coderabbitai Bot commented Jul 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Uh oh!

coderabbitai Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jparrill commented Jul 28, 2026

Uh oh!

jparrill commented Jul 28, 2026

Uh oh!

openshift-ci-robot commented Jul 28, 2026

Summary

Details

Change

Summary by CodeRabbit

Uh oh!

jparrill commented Jul 28, 2026

Uh oh!

jparrill commented Jul 28, 2026

Uh oh!

codecov Bot commented Jul 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

jparrill commented Jul 28, 2026

Uh oh!

csrwng commented Jul 28, 2026

Uh oh!

openshift-merge-bot Bot commented Jul 28, 2026

Uh oh!

jparrill commented Jul 28, 2026

Uh oh!

jparrill commented Jul 28, 2026

Uh oh!

openshift-ci-robot commented Jul 28, 2026

Uh oh!

openshift-ci Bot commented Jul 28, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

redhat-chai-bot commented Jul 28, 2026 •

edited by coderabbitai Bot

Loading

coderabbitai Bot commented Jul 28, 2026 •

edited

Loading

codecov Bot commented Jul 28, 2026 •

edited

Loading