Skip to content

OCPBUGS-87360: Updating ose-machine-api-operator-container image to be consistent with ART for 5.0#1507

Open
openshift-bot wants to merge 1 commit into
openshift:mainfrom
openshift-bot:art-consistency-openshift-5.0-ose-machine-api-operator
Open

OCPBUGS-87360: Updating ose-machine-api-operator-container image to be consistent with ART for 5.0#1507
openshift-bot wants to merge 1 commit into
openshift:mainfrom
openshift-bot:art-consistency-openshift-5.0-ose-machine-api-operator

Conversation

@openshift-bot
Copy link
Copy Markdown
Contributor

@openshift-bot openshift-bot commented Jun 6, 2026

Updating ose-machine-api-operator-container image to be consistent with ART for 5.0
TLDR:
Product builds by ART can be configured for different base and builder images than corresponding CI
builds. This automated PR requests a change to CI configuration to align with ART's configuration;
please take steps to merge it quickly or contact ART to coordinate changes.

The configuration in the following ART component metadata is driving this alignment request:
ose-machine-api-operator.yml.

Detail:

This repository is out of sync with the downstream product builds for this component. The CI
configuration for at least one image differs from ART's expected product configuration. This should
be addressed to ensure that the component's CI testing accurate reflects what customers will
experience.

Most of these PRs are opened as an ART-driven proposal to migrate base image or builder(s) to a
different version, usually prior to GA. The intent is to effect changes in both configurations
simultaneously without breaking either CI or ART builds, so usually ART builds are configured to
consider CI as canonical and attempt to match CI config until the PR merges to align both. ART may
also configure changes in GA releases with CI remaining canonical for a brief grace period to enable
CI to succeed and the alignment PR to merge. In either case, ART configuration will be made
canonical at some point (typically at branch-cut before GA or release dev-cut after GA), so it is
important to align CI configuration as soon as possible.

PRs are also triggered when CI configuration changes without ART coordination, for instance to
change the number of builder images or to use a different golang version. These changes should be
coordinated with ART; whether ART configuration is canonical or not, preferably it would be updated
first to enable the changes to occur simultaneously in both CI and ART at the same time. This also
gives ART a chance to validate the intended changes first. For instance, ART compiles most
components with the Golang version being used by the control plane for a given OpenShift release.
Exceptions to this convention (i.e. you believe your component must be compiled with a Golang
version independent from the control plane) must be granted by the OpenShift staff engineers and
communicated to the ART team.

Roles & Responsibilities:

  • Component owners are responsible for ensuring these alignment PRs merge with passing
    tests OR that necessary metadata changes are reported to the ART team
    in #forum-ocp-art on Slack. If necessary, the changes required by this pull request can be
    introduced with a separate PR opened by the component team. Once the repository is aligned,
    this PR will be closed automatically.
  • In particular, it could be that a job like verify-deps is complaining. In that case, please open
    a new PR with the dependency issues addressed (and base images bumped). ART-9595 for reference.
  • Patch-manager or those with sufficient privileges within this repository may add
    any required labels to ensure the PR merges once tests are passing. In cases where ART config is
    canonical, downstream builds are already being built with these changes, and merging this PR
    only improves the fidelity of our CI. In cases where ART config is not canonical, this provides
    a grace period for the component team to align their CI with ART's configuration before it becomes
    canonical in product builds.

ART has been configured to reconcile your CI build root image (see https://docs.ci.openshift.org/docs/architecture/ci-operator/#build-root-image).
In order for your upstream .ci-operator.yaml configuration to be honored, you must set the following in your openshift/release ci-operator configuration file:

build_root:
  from_repository: true

Change behavior of future PRs:

  • In case you just want to follow the base images that ART suggests, you can configure additional labels to be
    set up automatically. This means that such a PR would merge without human intervention (and awareness!) in the future.
    To do so, open a PR to set the auto_label attribute in the image configuration. Example
  • You can set a commit prefix, like UPSTREAM: <carry>: . An example.

If you have any questions about this pull request, please reach out in the #forum-ocp-art Slack channel.

Summary by CodeRabbit

Release Notes

  • Chores
    • Updated build environment from Go 1.25 to Go 1.26
    • Updated container base image from OpenShift 4.22 to OpenShift 5.0

@openshift-bot openshift-bot force-pushed the art-consistency-openshift-5.0-ose-machine-api-operator branch from 485713c to f2ac957 Compare June 6, 2026 15:20
@openshift-bot
Copy link
Copy Markdown
Contributor Author

@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Jun 6, 2026

Walkthrough

The PR updates base image tags and Go version references across the CI configuration and Dockerfile. The .ci-operator.yaml CI build root image tag moves from Go 1.25 to 1.26 and OpenShift 4.22 to 5.0. The Dockerfile build and runtime stages are updated to match these same versions.

Changes

Base Image and Build Version Updates

Layer / File(s) Summary
Go 1.26 and OpenShift 5.0 base image updates
.ci-operator.yaml, Dockerfile.rhel
CI build root image tag is updated from rhel-9-release-golang-1.25-openshift-4.22 to rhel-9-release-golang-1.26-openshift-5.0. Dockerfile builder stage now uses Go 1.26 and runtime stage now uses OpenShift 5.0 base image; build steps and artifact copying logic remain unchanged.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

Possibly related PRs

  • openshift/machine-api-operator#1468: Updates CI release/build image tags and Dockerfile base images to align with OpenShift release versions, similar pattern of version synchronization.

Suggested labels

lgtm, verified, jira/valid-reference

Suggested reviewers

  • chrischdi
  • racheljpg
  • huali9

Important

Pre-merge checks failed

Please resolve all errors before merging. Addressing warnings is optional.

❌ Failed checks (1 error, 1 warning)

Check name Status Explanation Resolution
Container-Privileges ❌ Error allowHostNetwork: true found in machine-api-termination-handler SCC, granting host network access without clear restriction. Justify the allowHostNetwork: true setting in the SCC or replace with more restrictive network policy if host network access is unnecessary.
Single Node Openshift (Sno) Test Compatibility ⚠️ Warning New Ginkgo e2e tests added in test/e2e files lack SNO compatibility guards. Tests assume multi-node clusters by checking node counts and scaling, which will fail on SNO. Add [Skipped:SingleReplicaTopology] labels to test names or guard tests with exutil.IsSingleNode() checks to skip on SNO deployments.
✅ Passed checks (13 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
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 All Ginkgo test names use static strings. No dynamic patterns (fmt.Sprintf, concatenation, interpolation) found in test titles.
Test Structure And Quality ✅ Passed PR only modifies .ci-operator.yaml and Dockerfile.rhel (configuration files), not any test code. The custom check for Ginkgo test structure quality is not applicable.
Microshift Test Compatibility ✅ Passed All new e2e Ginkgo tests use [apigroup:machine.openshift.io] tags, so MicroShift CI jobs will automatically skip them despite using machine.openshift.io and config.openshift.io APIs.
Topology-Aware Scheduling Compatibility ✅ Passed This PR only modifies CI build configuration (.ci-operator.yaml, Dockerfile.rhel), not deployment manifests, operator code, or controllers. No new scheduling constraints are introduced.
Ote Binary Stdout Contract ✅ Passed PR updates container build config only. OTE binary correctly initializes logs with logs.InitLogs(), no stdout writes in process-level code, respects klog's stderr behavior.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR only modifies infrastructure files (.ci-operator.yaml, Dockerfile.rhel); no new Ginkgo e2e tests are added, so check is not applicable.
No-Weak-Crypto ✅ Passed No weak cryptographic algorithms (MD5, SHA1, DES, RC4, 3DES, Blowfish, ECB), custom crypto implementations, or insecure secret comparisons found in the codebase.
No-Sensitive-Data-In-Logs ✅ Passed No logging statements exposing sensitive data detected. PR contains only version updates to base images in .ci-operator.yaml and Dockerfile.rhel with no new logging code.
Title check ✅ Passed The title clearly and specifically describes the main change: updating container image configurations for OpenShift 5.0 consistency with ART.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@openshift-bot openshift-bot changed the title Updating ose-machine-api-operator-container image to be consistent with ART for 5.0 OCPBUGS-87360: Updating ose-machine-api-operator-container image to be consistent with ART for 5.0 Jun 6, 2026
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Jun 6, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@openshift-bot: This pull request references Jira Issue OCPBUGS-87360, 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)

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

Details

In response to this:

Updating ose-machine-api-operator-container image to be consistent with ART for 5.0
TLDR:
Product builds by ART can be configured for different base and builder images than corresponding CI
builds. This automated PR requests a change to CI configuration to align with ART's configuration;
please take steps to merge it quickly or contact ART to coordinate changes.

The configuration in the following ART component metadata is driving this alignment request:
ose-machine-api-operator.yml.

Detail:

This repository is out of sync with the downstream product builds for this component. The CI
configuration for at least one image differs from ART's expected product configuration. This should
be addressed to ensure that the component's CI testing accurate reflects what customers will
experience.

Most of these PRs are opened as an ART-driven proposal to migrate base image or builder(s) to a
different version, usually prior to GA. The intent is to effect changes in both configurations
simultaneously without breaking either CI or ART builds, so usually ART builds are configured to
consider CI as canonical and attempt to match CI config until the PR merges to align both. ART may
also configure changes in GA releases with CI remaining canonical for a brief grace period to enable
CI to succeed and the alignment PR to merge. In either case, ART configuration will be made
canonical at some point (typically at branch-cut before GA or release dev-cut after GA), so it is
important to align CI configuration as soon as possible.

PRs are also triggered when CI configuration changes without ART coordination, for instance to
change the number of builder images or to use a different golang version. These changes should be
coordinated with ART; whether ART configuration is canonical or not, preferably it would be updated
first to enable the changes to occur simultaneously in both CI and ART at the same time. This also
gives ART a chance to validate the intended changes first. For instance, ART compiles most
components with the Golang version being used by the control plane for a given OpenShift release.
Exceptions to this convention (i.e. you believe your component must be compiled with a Golang
version independent from the control plane) must be granted by the OpenShift staff engineers and
communicated to the ART team.

Roles & Responsibilities:

  • Component owners are responsible for ensuring these alignment PRs merge with passing
    tests OR that necessary metadata changes are reported to the ART team
    in #forum-ocp-art on Slack. If necessary, the changes required by this pull request can be
    introduced with a separate PR opened by the component team. Once the repository is aligned,
    this PR will be closed automatically.
  • In particular, it could be that a job like verify-deps is complaining. In that case, please open
    a new PR with the dependency issues addressed (and base images bumped). ART-9595 for reference.
  • Patch-manager or those with sufficient privileges within this repository may add
    any required labels to ensure the PR merges once tests are passing. In cases where ART config is
    canonical, downstream builds are already being built with these changes, and merging this PR
    only improves the fidelity of our CI. In cases where ART config is not canonical, this provides
    a grace period for the component team to align their CI with ART's configuration before it becomes
    canonical in product builds.

ART has been configured to reconcile your CI build root image (see https://docs.ci.openshift.org/docs/architecture/ci-operator/#build-root-image).
In order for your upstream .ci-operator.yaml configuration to be honored, you must set the following in your openshift/release ci-operator configuration file:

build_root:
 from_repository: true

Change behavior of future PRs:

  • In case you just want to follow the base images that ART suggests, you can configure additional labels to be
    set up automatically. This means that such a PR would merge without human intervention (and awareness!) in the future.
    To do so, open a PR to set the auto_label attribute in the image configuration. Example
  • You can set a commit prefix, like UPSTREAM: <carry>: . An example.

If you have any questions about this pull request, please reach out in the #forum-ocp-art Slack channel.

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 openshift-ci Bot requested review from RadekManak and mdbooth June 6, 2026 15:21
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 6, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign radekmanak for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

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

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@openshift-bot: This pull request references Jira Issue OCPBUGS-87360, which is valid.

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 POST, which is one of the valid states (NEW, ASSIGNED, POST)
Details

In response to this:

Updating ose-machine-api-operator-container image to be consistent with ART for 5.0
TLDR:
Product builds by ART can be configured for different base and builder images than corresponding CI
builds. This automated PR requests a change to CI configuration to align with ART's configuration;
please take steps to merge it quickly or contact ART to coordinate changes.

The configuration in the following ART component metadata is driving this alignment request:
ose-machine-api-operator.yml.

Detail:

This repository is out of sync with the downstream product builds for this component. The CI
configuration for at least one image differs from ART's expected product configuration. This should
be addressed to ensure that the component's CI testing accurate reflects what customers will
experience.

Most of these PRs are opened as an ART-driven proposal to migrate base image or builder(s) to a
different version, usually prior to GA. The intent is to effect changes in both configurations
simultaneously without breaking either CI or ART builds, so usually ART builds are configured to
consider CI as canonical and attempt to match CI config until the PR merges to align both. ART may
also configure changes in GA releases with CI remaining canonical for a brief grace period to enable
CI to succeed and the alignment PR to merge. In either case, ART configuration will be made
canonical at some point (typically at branch-cut before GA or release dev-cut after GA), so it is
important to align CI configuration as soon as possible.

PRs are also triggered when CI configuration changes without ART coordination, for instance to
change the number of builder images or to use a different golang version. These changes should be
coordinated with ART; whether ART configuration is canonical or not, preferably it would be updated
first to enable the changes to occur simultaneously in both CI and ART at the same time. This also
gives ART a chance to validate the intended changes first. For instance, ART compiles most
components with the Golang version being used by the control plane for a given OpenShift release.
Exceptions to this convention (i.e. you believe your component must be compiled with a Golang
version independent from the control plane) must be granted by the OpenShift staff engineers and
communicated to the ART team.

Roles & Responsibilities:

  • Component owners are responsible for ensuring these alignment PRs merge with passing
    tests OR that necessary metadata changes are reported to the ART team
    in #forum-ocp-art on Slack. If necessary, the changes required by this pull request can be
    introduced with a separate PR opened by the component team. Once the repository is aligned,
    this PR will be closed automatically.
  • In particular, it could be that a job like verify-deps is complaining. In that case, please open
    a new PR with the dependency issues addressed (and base images bumped). ART-9595 for reference.
  • Patch-manager or those with sufficient privileges within this repository may add
    any required labels to ensure the PR merges once tests are passing. In cases where ART config is
    canonical, downstream builds are already being built with these changes, and merging this PR
    only improves the fidelity of our CI. In cases where ART config is not canonical, this provides
    a grace period for the component team to align their CI with ART's configuration before it becomes
    canonical in product builds.

ART has been configured to reconcile your CI build root image (see https://docs.ci.openshift.org/docs/architecture/ci-operator/#build-root-image).
In order for your upstream .ci-operator.yaml configuration to be honored, you must set the following in your openshift/release ci-operator configuration file:

build_root:
 from_repository: true

Change behavior of future PRs:

  • In case you just want to follow the base images that ART suggests, you can configure additional labels to be
    set up automatically. This means that such a PR would merge without human intervention (and awareness!) in the future.
    To do so, open a PR to set the auto_label attribute in the image configuration. Example
  • You can set a commit prefix, like UPSTREAM: <carry>: . An example.

If you have any questions about this pull request, please reach out in the #forum-ocp-art Slack channel.

Summary by CodeRabbit

Release Notes

  • Chores
  • Updated build environment from Go 1.25 to Go 1.26
  • Updated container base image from OpenShift 4.22 to OpenShift 5.0

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.

Copy link
Copy Markdown

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

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

🧹 Nitpick comments (1)
Dockerfile.rhel (1)

1-21: ⚡ Quick win

Missing USER directive violates container security guidelines.

The Dockerfile does not include a USER directive, causing the container to run as root. This violates the coding guidelines requirement: "USER non-root; never run as root."

While this is a pre-existing issue (not introduced by this PR), it should be addressed to comply with container security best practices. Note that if the machine-api-operator requires root privileges for its operations, this should be explicitly documented and justified.

As per coding guidelines: "USER non-root; never run as root" from the container security (prodsec-skills) requirements.

🔒 Proposed fix to add non-root USER
 FROM registry.ci.openshift.org/ocp/5.0:base-rhel9
 COPY --from=builder /go/src/github.com/openshift/machine-api-operator/install manifests
 COPY --from=builder /go/src/github.com/openshift/machine-api-operator/bin/machine-api-operator .
 COPY --from=builder /go/src/github.com/openshift/machine-api-operator/bin/nodelink-controller .
 COPY --from=builder /go/src/github.com/openshift/machine-api-operator/bin/machine-healthcheck .
 COPY --from=builder /go/src/github.com/openshift/machine-api-operator/bin/machineset ./machineset-controller
 COPY --from=builder /go/src/github.com/openshift/machine-api-operator/bin/vsphere ./machine-controller-manager
 COPY --from=builder /tmp/build/machine-api-tests-ext.gz .
+
+USER 1001

 LABEL io.k8s.display-name="OpenShift Machine API Operator" \
       io.openshift.release.operator=true \
       io.openshift.tags="openshift,tests,e2e,e2e-extension"

Note: Verify that UID 1001 (or another non-root user) is appropriate for the operator's runtime requirements.

🤖 Prompt for 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.

In `@Dockerfile.rhel` around lines 1 - 21, Add a non-root USER in the final image
and ensure the copied artifacts are owned/accessible by that user: in the
Dockerfile adjust the final stage (after COPY --from=builder ... lines) to
create or choose a non-root user/UID (e.g., 1001), chown the installed files and
binaries (install manifests, machine-api-operator, nodelink-controller,
machine-healthcheck, machineset-controller, machine-controller-manager, and
machine-api-tests-ext.gz) to that user and then set USER to it; verify file
permissions allow execution where needed and document if root is actually
required.

Sources: Coding guidelines, Linters/SAST tools

🤖 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.

Nitpick comments:
In `@Dockerfile.rhel`:
- Around line 1-21: Add a non-root USER in the final image and ensure the copied
artifacts are owned/accessible by that user: in the Dockerfile adjust the final
stage (after COPY --from=builder ... lines) to create or choose a non-root
user/UID (e.g., 1001), chown the installed files and binaries (install
manifests, machine-api-operator, nodelink-controller, machine-healthcheck,
machineset-controller, machine-controller-manager, and machine-api-tests-ext.gz)
to that user and then set USER to it; verify file permissions allow execution
where needed and document if root is actually required.

ℹ️ Review info
⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: 889c4a5e-0a4d-4f8b-bcf1-62b3584c280c

📥 Commits

Reviewing files that changed from the base of the PR and between d7772c6 and f2ac957.

📒 Files selected for processing (2)
  • .ci-operator.yaml
  • Dockerfile.rhel

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 6, 2026

@openshift-bot: 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/e2e-metal-ipi f2ac957 link true /test e2e-metal-ipi

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants