OCPBUGS-87365: Updating openshift-enterprise-builder-container image to be consistent with ART for 5.0#539
Conversation
openshift-bot
force-pushed
the
art-consistency-openshift-5.0-openshift-enterprise-builder
branch
from
e1eb2b0 to
93f96fd
Compare
|
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 |
WalkthroughThe PR updates build environment dependencies across CI configuration and Docker image definitions. The CI operator configuration and Dockerfile are both bumped to use OpenShift 5.0 and Go 1.26 base images, replacing the previous 4.22 and Go 1.25 versions. ChangesBase image and build dependency upgrade
Estimated code review effort🎯 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
|
[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-ci-robot
added
jira/valid-reference
|
@openshift-bot: This pull request references Jira Issue OCPBUGS-87365, 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-bot: This pull request references Jira Issue OCPBUGS-87365, 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.
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (2)
Dockerfile.rhel8 (2)
38-42:⚠️ Potential issue | 🟠 Major | ⚡ Quick winDefine a
HEALTHCHECKfor the runtime image.The final image has no
HEALTHCHECK, which violates the container baseline in this repository.Proposed fix
@@ LABEL io.k8s.display-name="OpenShift Builder" \ io.k8s.description="This is a component of OpenShift and is responsible for executing image builds." \ io.openshift.tags="openshift,builder" +HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \ + CMD test -x /usr/bin/openshift-builder || exit 1 USER 1001 ENTRYPOINT [ "/usr/bin/entrypoint.sh" ]As 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.rhel8` around lines 38 - 42, Add a HEALTHCHECK to the final runtime image immediately after the existing ENTRYPOINT declaration to satisfy the container baseline; implement a non-failing probe (e.g., run a small script or curl against localhost) and configure sensible options (interval, timeout, start-period, retries) so the container runtime can detect unhealthy states—refer to the Dockerfile's existing ENTRYPOINT ["/usr/bin/entrypoint.sh"] to place the HEALTHCHECK right after it and, if needed, add or call a lightweight executable (for example /usr/bin/healthcheck.sh) that returns proper exit codes for success/failure.Source: Coding guidelines
6-42:⚠️ Potential issue | 🟠 Major | ⚡ Quick winAdd a non-root runtime user in the final stage.
Line 6 starts the runtime stage, but no
USERis set before Line 41ENTRYPOINT, so the container runs as root by default.Proposed fix
@@ LABEL io.k8s.display-name="OpenShift Builder" \ io.k8s.description="This is a component of OpenShift and is responsible for executing image builds." \ io.openshift.tags="openshift,builder" +USER 1001 ENTRYPOINT [ "/usr/bin/entrypoint.sh" ]As per coding guidelines, "
USER non-root; never run as root".🤖 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.rhel8` around lines 6 - 42, The final image currently runs as root (no USER set) even though ENTRYPOINT ["/usr/bin/entrypoint.sh"] exists; add a non-root runtime user and switch to it before the ENTRYPOINT: create a dedicated user/group (e.g., builder or runtime), chown any runtime-owned dirs/files created earlier (like /var/cache/blobs, /var/lib/shared/*, /etc/pki/tls/certs, /etc/docker/certs.d and /usr/bin/entrypoint.sh) to that user, and then add a USER <name> line so the container runs as that non-root user at runtime (ensure symbolic links like /usr/bin/openshift-builder remain executable by that user).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.
Outside diff comments:
In `@Dockerfile.rhel8`:
- Around line 38-42: Add a HEALTHCHECK to the final runtime image immediately
after the existing ENTRYPOINT declaration to satisfy the container baseline;
implement a non-failing probe (e.g., run a small script or curl against
localhost) and configure sensible options (interval, timeout, start-period,
retries) so the container runtime can detect unhealthy states—refer to the
Dockerfile's existing ENTRYPOINT ["/usr/bin/entrypoint.sh"] to place the
HEALTHCHECK right after it and, if needed, add or call a lightweight executable
(for example /usr/bin/healthcheck.sh) that returns proper exit codes for
success/failure.
- Around line 6-42: The final image currently runs as root (no USER set) even
though ENTRYPOINT ["/usr/bin/entrypoint.sh"] exists; add a non-root runtime user
and switch to it before the ENTRYPOINT: create a dedicated user/group (e.g.,
builder or runtime), chown any runtime-owned dirs/files created earlier (like
/var/cache/blobs, /var/lib/shared/*, /etc/pki/tls/certs, /etc/docker/certs.d and
/usr/bin/entrypoint.sh) to that user, and then add a USER <name> line so the
container runs as that non-root user at runtime (ensure symbolic links like
/usr/bin/openshift-builder remain executable by that user).
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml
Review profile: CHILL
Plan: Enterprise
Run ID: 7ad48001-2970-4f38-98cc-30411028b9ae
📒 Files selected for processing (2)
.ci-operator.yamlDockerfile.rhel8
|
@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. |
|
ART wants to connect issue OCPBUGS-87651 to this PR, but found it is currently hooked up to ['OCPBUGS-87365']. Please consult with #forum-ocp-art if it is not clear what there is to do. |
3 participants
Updating openshift-enterprise-builder-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-builder.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.