OCPBUGS-87298: Updating ingress-node-firewall-daemon-container image to be consistent with ART for 5.0#717
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 pull request updates the build infrastructure to use Go 1.26 and OpenShift 5.0. The CI operator configuration and daemon Dockerfile are both updated to reference the new base image tags, while build and assembly logic remain unchanged. ChangesBase Image and Builder Version Updates
Estimated code review effort🎯 1 (Trivial) | ⏱️ ~3 minutes Important Pre-merge checks failedPlease resolve all errors before merging. Addressing warnings is optional. ❌ Failed checks (1 error, 2 warnings)
✅ Passed checks (12 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
openshift-bot
changed the title
openshift-ci-robot
added
jira/valid-reference
|
@openshift-bot: This pull request references Jira Issue OCPBUGS-87298, 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 |
![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.daemon.openshift (2)
1-11:⚠️ Potential issue | 🔴 Critical | 🏗️ Heavy liftCritical security violation: Container runs as root.
The Dockerfile does not include a
USERdirective, meaning the container runs as root by default. As per coding guidelines, containers must run as non-root users. This is a critical security risk in production environments.🛡️ Proposed fix to add non-root user
FROM registry.ci.openshift.org/ocp/5.0:base-rhel9 +RUN useradd -r -u 1001 -g 0 daemon-user COPY --from=builder /go/src/github.com/openshift/ingress-node-firewall/bin/daemon /usr/bin/ COPY --from=builder /go/src/github.com/openshift/ingress-node-firewall/bin/syslog /usr/bin/ +USER 1001 CMD ["/usr/bin/daemon"]As per coding guidelines, "USER non-root; never run as root" is required for all Dockerfiles.
🤖 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.daemon.openshift` around lines 1 - 11, The image runs as root because Dockerfile.daemon.openshift lacks a USER directive; add a non-root user and switch to it in the final stage: create a dedicated uid/gid (or use a minimal non-root user), ensure the two copied binaries (/usr/bin/daemon and /usr/bin/syslog) and any required directories are owned and executable by that user (chown/chmod during the final stage), then set USER to that non-root user so the container does not run as root.Source: Coding guidelines
1-11:⚠️ Potential issue | 🟠 MajorAdd HEALTHCHECK to Dockerfile.daemon.openshift
Dockerfile.daemon.openshifthas noHEALTHCHECKdirective, and there are noHEALTHCHECKdirectives in anyDockerfile*/Containerfile*in this repo. The daemon already registers controller-runtime health/ready checks (healthz,readyz) on the probe listener (--health-probe-bind-address, default127.0.0.1:39400), so the containerHEALTHCHECKshould query that same probe endpoint.🤖 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.daemon.openshift` around lines 1 - 11, Add a Docker HEALTHCHECK that queries the daemon's controller-runtime probe listener (use the same probe address flag --health-probe-bind-address and the /healthz or /readyz endpoints) so the container reports unhealthy when the app probe fails; modify Dockerfile.daemon.openshift (which sets CMD ["/usr/bin/daemon"]) to include a HEALTHCHECK line (for example: HEALTHCHECK --interval=30s CMD curl -f http://127.0.0.1:39400/readyz || exit 1) or an equivalent command available in the base image, ensuring it targets 127.0.0.1:39400 (the default for --health-probe-bind-address) and returns non-zero on failure.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.daemon.openshift`:
- Line 4: Replace the insecure "COPY . ." in Dockerfile.daemon.openshift with
explicit COPY instructions that only copy the files and directories required by
the build script; inspect ./hack/build-daemon.sh to determine the minimal set
(e.g., scripts, Dockerfile fragments, configs, source directories) and add
individual COPY lines for each required path, and add/adjust a .dockerignore to
exclude secrets and unnecessary files so sensitive data and large unrelated
context are not included in the image/build cache.
---
Outside diff comments:
In `@Dockerfile.daemon.openshift`:
- Around line 1-11: The image runs as root because Dockerfile.daemon.openshift
lacks a USER directive; add a non-root user and switch to it in the final stage:
create a dedicated uid/gid (or use a minimal non-root user), ensure the two
copied binaries (/usr/bin/daemon and /usr/bin/syslog) and any required
directories are owned and executable by that user (chown/chmod during the final
stage), then set USER to that non-root user so the container does not run as
root.
- Around line 1-11: Add a Docker HEALTHCHECK that queries the daemon's
controller-runtime probe listener (use the same probe address flag
--health-probe-bind-address and the /healthz or /readyz endpoints) so the
container reports unhealthy when the app probe fails; modify
Dockerfile.daemon.openshift (which sets CMD ["/usr/bin/daemon"]) to include a
HEALTHCHECK line (for example: HEALTHCHECK --interval=30s CMD curl -f
http://127.0.0.1:39400/readyz || exit 1) or an equivalent command available in
the base image, ensuring it targets 127.0.0.1:39400 (the default for
--health-probe-bind-address) and returns non-zero on failure.
🪄 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: 392c2065-5bcf-43d8-b679-4fdc03652de8
📒 Files selected for processing (2)
.ci-operator.yamlDockerfile.daemon.openshift
| FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0 AS builder | ||
|
|
||
| WORKDIR /go/src/github.com/openshift/ingress-node-firewall | ||
| COPY . . |
There was a problem hiding this comment.
Security best practice: Copy specific files instead of entire context.
Line 4 copies the entire build context (. .), which violates the guideline to "COPY specific files, not entire context". This can inadvertently include sensitive files, secrets, or unnecessary data in the build cache.
Consider updating to copy only the necessary files and directories required by ./hack/build-daemon.sh. You may need to inspect the build script to determine the minimal required file set.
As per coding guidelines, "COPY specific files, not entire context" is required for container security.
🤖 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.daemon.openshift` at line 4, Replace the insecure "COPY . ." in
Dockerfile.daemon.openshift with explicit COPY instructions that only copy the
files and directories required by the build script; inspect
./hack/build-daemon.sh to determine the minimal set (e.g., scripts, Dockerfile
fragments, configs, source directories) and add individual COPY lines for each
required path, and add/adjust a .dockerignore to exclude secrets and unnecessary
files so sensitive data and large unrelated context are not included in the
image/build cache.
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. |
|
@openshift-bot: This pull request references Jira Issue OCPBUGS-87298, 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. |
|
ART wants to connect issue OCPBUGS-87612 to this PR, but found it is currently hooked up to ['OCPBUGS-87298']. Please consult with #forum-ocp-art if it is not clear what there is to do. |
3 participants
Updating ingress-node-firewall-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:
ingress-node-firewall-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.