OCPBUGS-87448: Updating csi-livenessprobe-container image to be consistent with ART for 5.0#93
Conversation
e3ea84a to
ad834fc
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/216 |
WalkthroughCI and container build configurations are updated to use Go 1.26 and OpenShift 5.0 as the build and runtime bases, replacing Go 1.25 and OpenShift 4.22 tags across the CI operator configuration and Dockerfile. ChangesBuild Infrastructure Updates
Estimated code review effort🎯 1 (Trivial) | ⏱️ ~2 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-87448, 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-87448, 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: 2
🤖 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 an unapproved base image
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0; replace
the FROM line for the builder stage to use an approved UBI minimal or distroless
image hosted on catalog.redhat.com (e.g., a UBI minimal Golang builder or
appropriate distroless variant) and update any stage name references (builder)
accordingly; ensure the new image tag is the approved productized tag from
catalog.redhat.com and verify any subsequent build artifacts remain compatible
with the new base.
- Around line 6-8: The final stage runs as root because there is no USER
instruction; modify the Dockerfile to create or use a non-root user and set USER
before ENTRYPOINT (e.g., add a RUN that creates a low-privilege user/group and
chowns /usr/bin/livenessprobe if needed, then add USER <username|UID> before
ENTRYPOINT). Ensure the change applies to the final stage that contains COPY
--from=builder /go/src/github.com/kubernetes-csi/livenessprobe/bin/livenessprobe
/usr/bin/ and the ENTRYPOINT ["/usr/bin/livenessprobe"] so the container runs
non-root.
🪄 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: f28acc1f-7ea1-4a72-bad7-fdbd47f2abc4
📒 Files selected for processing (2)
.ci-operator.yamlDockerfile.ocp
| @@ -1,8 +1,8 @@ | |||
| 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 base images from catalog.redhat.com per container policy.
The updated FROM images are not using the required UBI minimal or distroless source from catalog.redhat.com, so this change violates the repository container-security standard.
As per coding guidelines, "Base image: UBI minimal or distroless from catalog.redhat.com."
Also applies to: 6-6
🧰 Tools
🪛 Trivy (0.69.3)
[error] 1-1: Image user should not be 'root'
Specify at least 1 USER command in Dockerfile with non-root user as argument
Rule: DS-0002
(IaC/Dockerfile)
🤖 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 an unapproved base image
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0; replace
the FROM line for the builder stage to use an approved UBI minimal or distroless
image hosted on catalog.redhat.com (e.g., a UBI minimal Golang builder or
appropriate distroless variant) and update any stage name references (builder)
accordingly; ensure the new image tag is the approved productized tag from
catalog.redhat.com and verify any subsequent build artifacts remain compatible
with the new base.
Source: Coding guidelines
| FROM registry.ci.openshift.org/ocp/5.0:base-rhel9 | ||
| COPY --from=builder /go/src/github.com/kubernetes-csi/livenessprobe/bin/livenessprobe /usr/bin/ | ||
| ENTRYPOINT ["/usr/bin/livenessprobe"] |
There was a problem hiding this comment.
Set a non-root runtime user in the final stage.
The final image has no USER instruction, so it runs as root by default. Please set an explicit non-root user before ENTRYPOINT.
Suggested patch
FROM registry.ci.openshift.org/ocp/5.0:base-rhel9
COPY --from=builder /go/src/github.com/kubernetes-csi/livenessprobe/bin/livenessprobe /usr/bin/
+USER 65532
ENTRYPOINT ["/usr/bin/livenessprobe"]As per coding guidelines, "USER non-root; never run as root."
📝 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.
| FROM registry.ci.openshift.org/ocp/5.0:base-rhel9 | |
| COPY --from=builder /go/src/github.com/kubernetes-csi/livenessprobe/bin/livenessprobe /usr/bin/ | |
| ENTRYPOINT ["/usr/bin/livenessprobe"] | |
| FROM registry.ci.openshift.org/ocp/5.0:base-rhel9 | |
| COPY --from=builder /go/src/github.com/kubernetes-csi/livenessprobe/bin/livenessprobe /usr/bin/ | |
| USER 65532 | |
| ENTRYPOINT ["/usr/bin/livenessprobe"] |
🤖 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 6 - 8, The final stage runs as root because
there is no USER instruction; modify the Dockerfile to create or use a non-root
user and set USER before ENTRYPOINT (e.g., add a RUN that creates a
low-privilege user/group and chowns /usr/bin/livenessprobe if needed, then add
USER <username|UID> before ENTRYPOINT). Ensure the change applies to the final
stage that contains COPY --from=builder
/go/src/github.com/kubernetes-csi/livenessprobe/bin/livenessprobe /usr/bin/ and
the ENTRYPOINT ["/usr/bin/livenessprobe"] so the container runs non-root.
Sources: Coding guidelines, Linters/SAST tools
|
@openshift-bot: all tests passed! 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-87702 to this PR, but found it is currently hooked up to ['OCPBUGS-87448']. Please consult with #forum-ocp-art if it is not clear what there is to do. |
|
[APPROVALNOTIFIER] This PR is APPROVED Approval requirements bypassed by manually added approval. This pull-request has been approved by: openshift-bot The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
@openshift-bot: Jira Issue Verification Checks: Jira Issue OCPBUGS-87448 Jira Issue OCPBUGS-87448 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓 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. |
Updating csi-livenessprobe-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:
csi-livenessprobe.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.