OCPBUGS-87459: Updating ose-network-metrics-daemon-container image to be consistent with ART for 5.0#144
Conversation
openshift-bot
force-pushed
the
art-consistency-openshift-5.0-ose-network-metrics-daemon
branch
from
1364557 to
53cd87e
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 |
WalkthroughThis PR updates container build image versions across CI and build configuration files. The CI operator build root image tag and both Dockerfile builder and runtime base images are bumped from OpenShift 4.22/Golang 1.24 to OpenShift 5.0/Golang 1.26. ChangesBuild Container Image Version Bump
Estimated code review effort🎯 1 (Trivial) | ⏱️ ~2 minutes Possibly related PRs
Suggested labels
Suggested reviewers
🚥 Pre-merge checks | ✅ 15✅ Passed checks (15 passed)
✨ 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-87459, 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-87459, 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: 1
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (2)
Dockerfile.openshift (2)
9-9:⚠️ Potential issue | 🟠 Major | ⚡ Quick winAvoid copying full build context into the builder stage (Line 9).
COPY . $PKG_PATH/pulls everything into the image build context. Copy only required files (for examplego.mod,go.sum,vendor/,pkg/,cmd/,Makefile) to reduce exposure and improve reproducibility.As per coding guidelines, "
**/{Dockerfile,Containerfile}*: COPY specific files, not entire context".🤖 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.openshift` at line 9, The Dockerfile currently uses a broad COPY command ("COPY . $PKG_PATH/") which pulls the entire build context into the builder stage; replace it by copying only the required artifacts (e.g. "go.mod", "go.sum", "vendor/", "pkg/", "cmd/", "Makefile" or other repo-specific source dirs) into $PKG_PATH to limit context and improve reproducibility; update the COPY . $PKG_PATH/ line to multiple targeted COPY entries that list only those required files and directories and remove any unnecessary or sensitive files from the builder image.Source: Coding guidelines
16-25:⚠️ Potential issue | 🟠 Major | ⚡ Quick winSet non-root runtime user and add healthcheck in final image (Line 16-25).
The runtime stage does not declare
USERand has noHEALTHCHECK, which violates container hardening policy.Suggested hardening patch
FROM registry.ci.openshift.org/ocp/5.0:base-rhel9 COPY --from=builder /go/src/github.com/openshift/network-metrics-daemon/bin/network-metrics-daemon /usr/bin/network-metrics +USER 1001 +HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 CMD ["/usr/bin/network-metrics", "--help"] LABEL io.k8s.display-name="Network Metrics Daemon" \ io.k8s.description="This is a component of OpenShift Container Platform and provides a daemon that exposes admission controller for Multus CNI custom resources." \ io.openshift.tags="openshift" \ maintainer="Federico Paolinelli <fpaoline@redhat.com>"As per coding guidelines, "
**/{Dockerfile,Containerfile}*: USER non-root; never run as root" and "**/{Dockerfile,Containerfile}*: 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.openshift` around lines 16 - 25, The final image is running as root and lacks a HEALTHCHECK; modify the runtime stage so it creates or uses a non-root user, ensures the shipped binary (/usr/bin/network-metrics) is owned/executable by that user, adds a USER directive to switch to that non-root user, and add a HEALTHCHECK instruction that exercises the daemon (e.g., curl or invoking the binary's health endpoint/flag) to report healthy/unhealthy; look for the CMD ["/usr/bin/network-metrics"] and the COPY --from=builder line to update ownership/permissions and then append USER and HEALTHCHECK entries in the final 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 `@Dockerfile.openshift`:
- Line 2: Replace the non-compliant CI base images used in the two FROM
directives with Red Hat catalog images (UBI minimal or distroless from
catalog.redhat.com); specifically update the first FROM that defines the builder
stage (the line starting with "FROM ... AS builder") and the second FROM used
for the final stage to use approved images such as
catalog.redhat.com/ubi9/ubi-minimal:<appropriate-tag> or a catalog.redhat.com
distroless equivalent, ensuring both FROM lines no longer reference
registry.ci.openshift.org and that the chosen tags match your supported Red Hat
UBI/distroless version.
---
Outside diff comments:
In `@Dockerfile.openshift`:
- Line 9: The Dockerfile currently uses a broad COPY command ("COPY .
$PKG_PATH/") which pulls the entire build context into the builder stage;
replace it by copying only the required artifacts (e.g. "go.mod", "go.sum",
"vendor/", "pkg/", "cmd/", "Makefile" or other repo-specific source dirs) into
$PKG_PATH to limit context and improve reproducibility; update the COPY .
$PKG_PATH/ line to multiple targeted COPY entries that list only those required
files and directories and remove any unnecessary or sensitive files from the
builder image.
- Around line 16-25: The final image is running as root and lacks a HEALTHCHECK;
modify the runtime stage so it creates or uses a non-root user, ensures the
shipped binary (/usr/bin/network-metrics) is owned/executable by that user, adds
a USER directive to switch to that non-root user, and add a HEALTHCHECK
instruction that exercises the daemon (e.g., curl or invoking the binary's
health endpoint/flag) to report healthy/unhealthy; look for the CMD
["/usr/bin/network-metrics"] and the COPY --from=builder line to update
ownership/permissions and then append USER and HEALTHCHECK entries in the final
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: a829693b-3359-47ad-a763-c5b805e09aec
📒 Files selected for processing (2)
.ci-operator.yamlDockerfile.openshift
| @@ -1,5 +1,5 @@ | |||
| # This dockerfile is specific to building the network metrics daemon for OpenShift | |||
| FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-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 production base images per policy (Line 2, Line 16).
Both stages currently use registry.ci.openshift.org/... images, but policy requires UBI minimal or distroless images from catalog.redhat.com. Please switch both FROM lines to compliant Red Hat catalog images.
As per coding guidelines, "**/{Dockerfile,Containerfile}*: Base image: UBI minimal or distroless from catalog.redhat.com".
Also applies to: 16-16
🤖 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.openshift` at line 2, Replace the non-compliant CI base images
used in the two FROM directives with Red Hat catalog images (UBI minimal or
distroless from catalog.redhat.com); specifically update the first FROM that
defines the builder stage (the line starting with "FROM ... AS builder") and the
second FROM used for the final stage to use approved images such as
catalog.redhat.com/ubi9/ubi-minimal:<appropriate-tag> or a catalog.redhat.com
distroless equivalent, ensuring both FROM lines no longer reference
registry.ci.openshift.org and that the chosen tags match your supported Red Hat
UBI/distroless version.
Source: Coding guidelines
|
@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-87713 to this PR, but found it is currently hooked up to ['OCPBUGS-87459']. Please consult with #forum-ocp-art if it is not clear what there is to do. |
openshift-bot
added
the
verified
3 participants
Updating ose-network-metrics-daemon-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-network-metrics-daemon.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.