OCPBUGS-87469: Updating openshift-enterprise-hyperkube-container image to be consistent with ART for 5.0#2684
Conversation
…image to be consistent with ART for 5.0 Reconciling with https://github.com/openshift-eng/ocp-build-data/tree/af322abdd1a4d7d0161a69a16369a0ab1748515a/images/openshift-enterprise-hyperkube.yml
|
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/216 |
|
@openshift-bot: the contents of this pull request could not be automatically validated. The following commits could not be validated and must be approved by a top-level approver:
Comment |
|
@openshift-bot: This pull request references Jira Issue OCPBUGS-87469, 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. |
|
[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 |
WalkthroughThis pull request upgrades the Kubernetes build infrastructure from OpenShift 4.22 with Go 1.25 to OpenShift 5.0 with Go 1.26. The CI operator configuration and Dockerfile base images are updated together to reflect the new toolchain and runtime versions. ChangesBuild Infrastructure Version 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: This pull request references Jira Issue OCPBUGS-87469, 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. |
There was a problem hiding this comment.
Actionable comments posted: 1
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
openshift-hack/images/hyperkube/Dockerfile.rhel (1)
12-18:⚠️ Potential issue | 🟠 Major | ⚡ Quick winFinal image is missing explicit non-root user and healthcheck.
The runtime stage does not declare
USERand has noHEALTHCHECK, both required by container security policy.Suggested patch
FROM registry.ci.openshift.org/ocp/5.0:base-rhel9 RUN yum install -y --setopt=tsflags=nodocs --setopt=skip_missing_names_on_install=False iproute && yum clean all COPY --from=builder /tmp/build/* /usr/bin/ +USER 1001 +HEALTHCHECK --interval=30s --timeout=5s --start-period=30s --retries=3 \ + CMD /usr/bin/kubelet --version >/dev/null || exit 1 LABEL io.k8s.display-name="OpenShift Kubernetes Server Commands" \ io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \ io.openshift.tags="openshift,hyperkube" \ io.openshift.build.versions="kubernetes=1.35.3"As per coding guidelines, "
**/{Dockerfile,Containerfile}*: USER non-root; never run as root" and "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 `@openshift-hack/images/hyperkube/Dockerfile.rhel` around lines 12 - 18, The final image layer starting at the runtime stage (FROM registry.ci.openshift.org/ocp/5.0:base-rhel9 and the subsequent COPY/COPY --from=builder /tmp/build/* /usr/bin/ and LABEL lines) must declare a non-root runtime user and a HEALTHCHECK; update the Dockerfile to create or use a non-root user (e.g., add user creation or switch to an existing uid/gid and add a USER <user> line) so the container does not run as root, and add a HEALTHCHECK instruction (with a sensible CMD/exit check, interval, timeout/start-period and retries) to validate the hyperkube binary is healthy at runtime. Ensure the USER line is after all root-only setup steps (like yum, copy) and before the final CMD/ENTRYPOINT, and place the HEALTHCHECK in the final stage so it applies to the produced image.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 `@openshift-hack/images/hyperkube/Dockerfile.rhel`:
- Line 1: The Dockerfile currently uses CI registry images (the "builder" stage
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0)
which violates the policy; replace both stage base images (the builder stage and
the final/distroless stage) with approved catalog.redhat.com UBI minimal or
distroless images (e.g., catalog.redhat.com/containers/ubi9/ubi-minimal or the
appropriate distroless catalog.redhat.com image) that match the required
runtime/toolchain (Go 1.26) to preserve provenance and compliance; update the
FROM lines accordingly in the Dockerfile so both stages reference
catalog.redhat.com UBI/distroless bases.
---
Outside diff comments:
In `@openshift-hack/images/hyperkube/Dockerfile.rhel`:
- Around line 12-18: The final image layer starting at the runtime stage (FROM
registry.ci.openshift.org/ocp/5.0:base-rhel9 and the subsequent COPY/COPY
--from=builder /tmp/build/* /usr/bin/ and LABEL lines) must declare a non-root
runtime user and a HEALTHCHECK; update the Dockerfile to create or use a
non-root user (e.g., add user creation or switch to an existing uid/gid and add
a USER <user> line) so the container does not run as root, and add a HEALTHCHECK
instruction (with a sensible CMD/exit check, interval, timeout/start-period and
retries) to validate the hyperkube binary is healthy at runtime. Ensure the USER
line is after all root-only setup steps (like yum, copy) and before the final
CMD/ENTRYPOINT, and place the HEALTHCHECK in the final stage so it applies to
the produced image.
🪄 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: b8236444-8fcf-4b24-b815-8c7593aac086
📒 Files selected for processing (2)
.ci-operator.yamlopenshift-hack/images/hyperkube/Dockerfile.rhel
| @@ -1,4 +1,4 @@ | |||
| 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 Red Hat catalog base images for both stages.
Both updated FROM lines point to CI registry images instead of catalog.redhat.com UBI/distroless bases required by policy. This weakens provenance/compliance guarantees for production container builds.
As per coding guidelines, "**/{Dockerfile,Containerfile}*: Base image: UBI minimal or distroless from catalog.redhat.com".
Also applies to: 12-12
🤖 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 `@openshift-hack/images/hyperkube/Dockerfile.rhel` at line 1, The Dockerfile
currently uses CI registry images (the "builder" stage FROM
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0) which
violates the policy; replace both stage base images (the builder stage and the
final/distroless stage) with approved catalog.redhat.com UBI minimal or
distroless images (e.g., catalog.redhat.com/containers/ubi9/ubi-minimal or the
appropriate distroless catalog.redhat.com image) that match the required
runtime/toolchain (Go 1.26) to preserve provenance and compliance; update the
FROM lines accordingly in the Dockerfile so both stages reference
catalog.redhat.com UBI/distroless bases.
Source: Coding guidelines
|
@openshift-bot: The following tests 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. |
|
We are updating this in the Kube rebase PR: 9d4b587. |
|
ART wants to connect issue OCPBUGS-87721 to this PR, but found it is currently hooked up to ['OCPBUGS-87469']. Please consult with #forum-ocp-art if it is not clear what there is to do. |
Updating openshift-enterprise-hyperkube-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-hyperkube.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.