OCPBUGS-87287: Updating openshift-enterprise-registry-container image to be consistent with ART for 5.0#472
Conversation
|
Created by ART pipeline job run https://art-jenkins.apps.prod-stable-spoke1-dc-iad2.itup.redhat.com/job/aos-cd-builds/job/build%252Fsync-ci-images/201 |
WalkthroughThis PR updates the build configuration to use newer OpenShift and Go versions. The CI operator configuration and Dockerfile both switch from OpenShift 4.22 with Go 1.25 to OpenShift 5.0 with Go 1.26 across builder and runtime stages. ChangesBuild Infrastructure Updates
🎯 1 (Trivial) | ⏱️ ~3 minutes 🚥 Pre-merge checks | ✅ 15✅ Passed checks (15 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
openshift-bot
changed the title
openshift-ci-robot
added
the
jira/valid-reference
|
@openshift-bot: This pull request references Jira Issue OCPBUGS-87287, which is valid. The bug has been moved to the POST state. 3 validation(s) were run on this bug
The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn response to this:
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-robot
added
the
jira/valid-bug
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: openshift-bot The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
@openshift-bot: This pull request references Jira Issue OCPBUGS-87287, which is valid. 3 validation(s) were run on this bug
DetailsIn response to this:
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[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 2
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
Dockerfile.ocp (1)
26-31:⚠️ Potential issue | 🟠 Major | ⚡ Quick winAdd a container
HEALTHCHECKin the final image.The runtime stage has no health check, which violates the Dockerfile policy and weakens runtime failure detection.
Example
+HEALTHCHECK --interval=30s --timeout=5s --start-period=20s --retries=3 \ + CMD ["/usr/bin/distribution", "--version"] || exit 1As per coding guidelines, "
HEALTHCHECK defined."🤖 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.ocp` around lines 26 - 31, The final image lacks a Docker HEALTHCHECK; add a HEALTHCHECK instruction in Dockerfile.ocp near the ENTRYPOINT/CMD to enable runtime liveness probing. Implement a HEALTHCHECK that runs a small, fast command appropriate for the registry (for example a HTTP probe against the registry listen port or a status CLI), and include sensible options (interval, timeout, retries) so failures are detected but transient issues are tolerated; ensure the probe exits 0 on healthy and non-zero on failure, and place the HEALTHCHECK after ENTRYPOINT/CMD so it applies to the final stage.Source: Coding guidelines
🤖 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.ocp`:
- Line 1: The Dockerfile uses registry.ci.openshift.org images; update both FROM
lines (including the first stage image referenced as "builder") to use the
approved catalog.redhat.com UBI minimal or distroless base images per policy
(replace registry.ci.openshift.org/... with the appropriate catalog.redhat.com
UBI/distroless equivalents), ensuring both build and final stages reference
catalog.redhat.com images.
- Line 3: Replace the unsafe "COPY . ." in Dockerfile.ocp with explicit COPY
instructions for only the build inputs referenced by hack/build-go.sh: inspect
hack/build-go.sh to determine required files (e.g., go.mod, go.sum, the cmd/
pkg/ internal/ directories, and any scripts/configs it invokes) and add one or
more COPY lines for those paths instead of the entire context; also update
.dockerignore to exclude secrets/unnecessary files and ensure no secrets are
passed via ENV or ARG in the Dockerfile.
---
Outside diff comments:
In `@Dockerfile.ocp`:
- Around line 26-31: The final image lacks a Docker HEALTHCHECK; add a
HEALTHCHECK instruction in Dockerfile.ocp near the ENTRYPOINT/CMD to enable
runtime liveness probing. Implement a HEALTHCHECK that runs a small, fast
command appropriate for the registry (for example a HTTP probe against the
registry listen port or a status CLI), and include sensible options (interval,
timeout, retries) so failures are detected but transient issues are tolerated;
ensure the probe exits 0 on healthy and non-zero on failure, and place the
HEALTHCHECK after ENTRYPOINT/CMD so it applies to the final stage.
🪄 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: openshift/coderabbit/.coderabbit.yaml
Review profile: CHILL
Plan: Enterprise
Run ID: f46b57d0-307a-42ae-a8df-1508ecdc8ef7
📒 Files selected for processing (2)
.ci-operator.yamlDockerfile.ocp
| @@ -1,9 +1,9 @@ | |||
| FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS builder | |||
| FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0 AS builder | |||
There was a problem hiding this comment.
Use approved catalog.redhat.com base images for both stages.
Both FROM lines currently use registry.ci.openshift.org, which violates the container base-image policy for Dockerfiles.
As per coding guidelines, "Base image: UBI minimal or distroless from catalog.redhat.com."
Also applies to: 6-6
🤖 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.ocp` at line 1, The Dockerfile uses registry.ci.openshift.org
images; update both FROM lines (including the first stage image referenced as
"builder") to use the approved catalog.redhat.com UBI minimal or distroless base
images per policy (replace registry.ci.openshift.org/... with the appropriate
catalog.redhat.com UBI/distroless equivalents), ensuring both build and final
stages reference catalog.redhat.com images.
Source: Coding guidelines
| FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS builder | ||
| FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0 AS builder | ||
| WORKDIR /go/src/github.com/openshift/image-registry | ||
| COPY . . |
There was a problem hiding this comment.
Avoid COPY . .; copy only required build inputs.
COPY . . can unintentionally pull secrets and unrelated files into the build context. Restrict this to explicit paths used by hack/build-go.sh.
Suggested tightening
-COPY . .
+COPY go.mod go.sum ./
+COPY cmd/ ./cmd/
+COPY pkg/ ./pkg/
+COPY hack/ ./hack/
+COPY vendor/ ./vendor/As per coding guidelines, "COPY specific files, not entire context" and "No secrets in ENV, ARG, or COPY."
📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| COPY . . | |
| COPY go.mod go.sum ./ | |
| COPY cmd/ ./cmd/ | |
| COPY pkg/ ./pkg/ | |
| COPY hack/ ./hack/ | |
| COPY vendor/ ./vendor/ |
🤖 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.ocp` at line 3, Replace the unsafe "COPY . ." in Dockerfile.ocp
with explicit COPY instructions for only the build inputs referenced by
hack/build-go.sh: inspect hack/build-go.sh to determine required files (e.g.,
go.mod, go.sum, the cmd/ pkg/ internal/ directories, and any scripts/configs it
invokes) and add one or more COPY lines for those paths instead of the entire
context; also update .dockerignore to exclude secrets/unnecessary files and
ensure no secrets are passed via ENV or ARG in the Dockerfile.
Source: Coding guidelines
|
@openshift-bot: The following test failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. |
2 participants
Updating openshift-enterprise-registry-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:
openshift-enterprise-registry.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:
tests OR that necessary metadata changes are reported to the ART team
in
#forum-ocp-arton Slack. If necessary, the changes required by this pull request can beintroduced with a separate PR opened by the component team. Once the repository is aligned,
this PR will be closed automatically.
verify-depsis complaining. In that case, please opena new PR with the dependency issues addressed (and base images bumped). ART-9595 for reference.
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:
Change behavior of future PRs:
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_labelattribute in the image configuration. ExampleUPSTREAM: <carry>:. An example.If you have any questions about this pull request, please reach out in the
#forum-ocp-artSlack channel.Summary by CodeRabbit