Skip to content

OCPBUGS-87358: Updating ose-cluster-config-operator-container image to be consistent with ART for 5.0#493

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

OCPBUGS-87358: Updating ose-cluster-config-operator-container image to be consistent with ART for 5.0#493
openshift-bot wants to merge 1 commit into
openshift:mainfrom
openshift-bot:art-consistency-openshift-5.0-ose-cluster-config-operator

Conversation

@openshift-bot
Copy link
Copy Markdown
Contributor

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

Updating ose-cluster-config-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-cluster-config-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.

@openshift-bot
Copy link
Copy Markdown
Contributor Author

@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Jun 6, 2026

Walkthrough

CI operator configuration and Dockerfile build stages updated to Go 1.26 and OpenShift 5.0 RHEL9 images, replacing Go 1.25 and OpenShift 4.22. Build steps, working directories, and runtime wiring remain unchanged.

Changes

Build Image Version Upgrade

Layer / File(s) Summary
Build image version upgrade
.ci-operator.yaml, Dockerfile.rhel7
.ci-operator.yaml build root image tag updated to rhel-9-release-golang-1.26-openshift-5.0; Dockerfile.rhel7 builder stage and final stage base images updated to OpenShift 5.0 and Go 1.26. All build steps, directories, copy operations, and labels remain unchanged.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

Possibly related PRs

Suggested labels

lgtm, approved, jira/valid-bug, jira/valid-reference, verified

Suggested reviewers

  • gangwgr
  • deads2k
  • everettraven
🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
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 The PR does not contain any Ginkgo tests. All test files use standard Go testing (func Test...) with *testing.T. The check for stable and deterministic Ginkgo test names is not applicable.
Test Structure And Quality ✅ Passed PR only updates build configuration files (.ci-operator.yaml, Dockerfile.rhel7) for ART 5.0 consistency; no test files are modified, making Ginkgo test review not applicable.
Microshift Test Compatibility ✅ Passed No new Ginkgo e2e tests were added in this PR. The changes are limited to updating build image tags in .ci-operator.yaml and Dockerfile.rhel7 for OpenShift 5.0 consistency, not test code.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR only updates base image tags in .ci-operator.yaml and Dockerfile.rhel7; no new Ginkgo e2e tests are added, making SNO test compatibility check inapplicable.
Topology-Aware Scheduling Compatibility ✅ Passed PR only updates container image tags in .ci-operator.yaml and Dockerfile.rhel7. No deployment manifests, operator code, or controllers are modified; no scheduling constraints are introduced.
Ote Binary Stdout Contract ✅ Passed PR contains only infrastructure config changes (CI image tags, Dockerfile base image updates); no application code, binary logic, or OTE binary stdout writing code was modified.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR does not add any new Ginkgo e2e tests; it only updates CI configuration and build container images (.ci-operator.yaml and Dockerfile.rhel7).
No-Weak-Crypto ✅ Passed PR only updates build configuration files with image tags. No weak crypto patterns (MD5, SHA1, DES, RC4, 3DES, Blowfish, ECB, custom implementations) detected in codebase.
Container-Privileges ✅ Passed PR updates only image tags. All K8s manifests have runAsNonRoot: true, allowPrivilegeEscalation: false, and no hostPID/hostNetwork/hostIPC settings or SYS_ADMIN capabilities.
No-Sensitive-Data-In-Logs ✅ Passed PR contains only CI configuration updates (image tag changes in .ci-operator.yaml and Dockerfile.rhel7) with no logging code, statements, or sensitive data exposure.
Title check ✅ Passed The title directly references the PR's main objective: updating the ose-cluster-config-operator-container image for OpenShift 5.0 consistency, which aligns with the file-level changes updating builder and runtime image tags.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ 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-cluster-config-operator-container image to be consistent with ART for 5.0 OCPBUGS-87358: Updating ose-cluster-config-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

@openshift-bot: This pull request references Jira Issue OCPBUGS-87358, 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-cluster-config-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-cluster-config-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 JoelSpeed and benluddy June 6, 2026 14:52
@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: openshift-bot
Once this PR has been reviewed and has the lgtm label, please assign deads2k 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

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

  • Chores
  • Updated build environment to Go 1.26 and OpenShift 5.0 runtime images (previously Go 1.25 and OpenShift 4.22)

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.rhel7 (1)

1-17: ⚡ Quick win

Pre-existing guideline violations should be addressed.

While not introduced by this PR, the Dockerfile has several violations of the container security coding guidelines:

  1. No USER command (lines 1-17): The container runs as root, violating the guideline "USER non-root; never run as root." This is also flagged by Trivy static analysis (DS-0002).

  2. Copies entire context (line 4): COPY . . copies the entire build context instead of specific files, violating "COPY specific files, not entire context."

  3. No HEALTHCHECK (lines 1-17): The guideline requires "HEALTHCHECK defined."

Consider addressing these in a follow-up to align with the prodsec-skills container security requirements.

🔒 Proposed fixes

Add a non-root USER before the final LABEL:

 COPY manifests /manifests
 
+USER 1001
+
 LABEL io.openshift.release.operator true

Replace the broad COPY with specific files in the builder stage:

 WORKDIR /go/src/github.com/openshift/cluster-config-operator
-COPY . .
+COPY go.mod go.sum ./
+COPY cmd/ cmd/
+COPY pkg/ pkg/
+COPY vendor/ vendor/
+COPY Makefile ./

Add a HEALTHCHECK if the operator exposes a health endpoint (adjust the URL/port as appropriate):

 LABEL io.openshift.release.operator true
+
+HEALTHCHECK --interval=30s --timeout=3s \
+  CMD ["/usr/bin/cluster-config-operator", "health-check"]

As per coding guidelines: "USER non-root; never run as root", "COPY specific files, not entire context", and "HEALTHCHECK defined" for container security.

🤖 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.rhel7` around lines 1 - 17, The Dockerfile currently runs as root,
copies the entire context, and lacks a HEALTHCHECK; fix by (1) in the builder
stage (reference: the builder stage starting with FROM ... AS builder and the
RUN make build), replace the broad "COPY . ." with explicit COPYs for only
required build inputs (e.g., COPY go.mod go.sum ./, COPY <pkg dirs>/ ./ or COPY
cmd/ pkg/ manifests/ Makefile .) so only necessary files are included; (2) in
the final stage (reference: the final FROM
registry.ci.openshift.org/...:base-rhel9 and the subsequent COPYs and LABEL),
create a non-root user/group and switch to it with USER <nonroot_user> before
the LABEL so the container does not run as root; and (3) add a HEALTHCHECK
instruction in the final stage pointing at the operator’s health endpoint or a
lightweight command that validates readiness to satisfy the HEALTHCHECK
requirement.

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.rhel7`:
- Around line 1-17: The Dockerfile currently runs as root, copies the entire
context, and lacks a HEALTHCHECK; fix by (1) in the builder stage (reference:
the builder stage starting with FROM ... AS builder and the RUN make build),
replace the broad "COPY . ." with explicit COPYs for only required build inputs
(e.g., COPY go.mod go.sum ./, COPY <pkg dirs>/ ./ or COPY cmd/ pkg/ manifests/
Makefile .) so only necessary files are included; (2) in the final stage
(reference: the final FROM registry.ci.openshift.org/...:base-rhel9 and the
subsequent COPYs and LABEL), create a non-root user/group and switch to it with
USER <nonroot_user> before the LABEL so the container does not run as root; and
(3) add a HEALTHCHECK instruction in the final stage pointing at the operator’s
health endpoint or a lightweight command that validates readiness to satisfy the
HEALTHCHECK requirement.

ℹ️ Review info
⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: 1cfc3a2b-7ffc-44d3-bd60-ce4fe8b00f5f

📥 Commits

Reviewing files that changed from the base of the PR and between 2697a43 and 8979361.

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

@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/verify 8979361 link true /test verify

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.

@openshift-bot
Copy link
Copy Markdown
Contributor Author

ART wants to connect issue OCPBUGS-87645 to this PR, but found it is currently hooked up to ['OCPBUGS-87358']. Please consult with #forum-ocp-art if it is not clear what there is to do.

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.

3 participants