OCPBUGS-87377: Updating ose-agent-installer-orchestrator-container image to be consistent with ART for 5.0#2172
Conversation
openshift-bot
force-pushed
the
art-consistency-openshift-5.0-ose-agent-installer-orchestrator
branch
from
b848c1a to
b04a287
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 |
WalkthroughThis pull request updates the build and runtime infrastructure from OpenShift 4.21 with Go 1.25 to OpenShift 5.0 with Go 1.26. The CI operator configuration and Dockerfile base images are aligned with this version bump. ChangesBuild Environment and Base Image Upgrade
🎯 1 (Trivial) | ⏱️ ~3 minutes 🚥 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-87377, 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
openshift-ci
Bot
added
the
size/XS
openshift-ci
Bot
added
the
downstream-change-needed
|
[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-87377, 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.assisted-installer.ocp (2)
6-6:⚠️ Potential issue | 🟠 Major | ⚡ Quick winAvoid copying the entire build context.
Line 6 copies everything, which violates policy and increases risk of unintentionally including sensitive or unnecessary files.
Proposed hardening diff
-COPY . . +COPY go.mod go.sum ./ +COPY vendor/ ./vendor/ +COPY cmd/ ./cmd/ +COPY src/ ./src/ +COPY Makefile ./As per coding guidelines, "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.assisted-installer.ocp` at line 6, The Dockerfile currently uses a broad COPY . . which pulls the entire build context; replace this by copying only the required artifacts (e.g., COPY package.json package-lock.json ./ and COPY dist/ ./ or COPY src/ ./ as appropriate) and add/update a .dockerignore to exclude secrets and dev files; locate the COPY . . instruction in the Dockerfile and change it to explicit COPY statements for the exact files/directories your build/runtime needs and ensure a .dockerignore excludes everything else.Source: Coding guidelines
10-18:⚠️ Potential issue | 🟠 Major | ⚡ Quick winHarden the runtime stage with non-root user and healthcheck.
The final image does not set a non-root
USERand does not define aHEALTHCHECK, both required by policy.Proposed hardening diff
FROM registry.ci.openshift.org/ocp/5.0:base-rhel9 @@ COPY --from=builder /go/src/github.com/openshift/assisted-installer/build/installer /usr/bin/installer COPY --from=builder /go/src/github.com/openshift/assisted-installer/deploy/assisted-installer-controller /assisted-installer-controller/deploy +USER 1001 +HEALTHCHECK --interval=30s --timeout=5s --start-period=20s --retries=3 \ + CMD ["/usr/bin/installer", "--help"] || exit 1 + ENTRYPOINT ["/usr/bin/installer"]As per coding guidelines, "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 `@Dockerfile.assisted-installer.ocp` around lines 10 - 18, The final stage runs as root and lacks a HEALTHCHECK; modify the Dockerfile to create/use a non-root user and add a healthcheck: add a dedicated user/group (or use an existing unprivileged user), chown the installed artifacts referenced by COPY (e.g., /usr/bin/installer and /assisted-installer-controller/deploy) to that user, add USER <non-root> before ENTRYPOINT, and add a HEALTHCHECK instruction that verifies the installer process (or an appropriate readiness endpoint) so the container reports health.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.assisted-installer.ocp`:
- Line 1: The Dockerfile's builder stage uses an unapproved base image (FROM
registry.ci.openshift.org/ocp/...), so replace that FROM line in the builder
stage with an approved UBI minimal or distroless image from catalog.redhat.com
(e.g., the appropriate UBI minimal or distroless golang-builder image) to comply
with the container hardening policy; update the builder stage reference
(builder) and any related image tags to match the chosen catalog.redhat.com
image and ensure any required toolchain or Go version compatibility is
preserved.
---
Outside diff comments:
In `@Dockerfile.assisted-installer.ocp`:
- Line 6: The Dockerfile currently uses a broad COPY . . which pulls the entire
build context; replace this by copying only the required artifacts (e.g., COPY
package.json package-lock.json ./ and COPY dist/ ./ or COPY src/ ./ as
appropriate) and add/update a .dockerignore to exclude secrets and dev files;
locate the COPY . . instruction in the Dockerfile and change it to explicit COPY
statements for the exact files/directories your build/runtime needs and ensure a
.dockerignore excludes everything else.
- Around line 10-18: The final stage runs as root and lacks a HEALTHCHECK;
modify the Dockerfile to create/use a non-root user and add a healthcheck: add a
dedicated user/group (or use an existing unprivileged user), chown the installed
artifacts referenced by COPY (e.g., /usr/bin/installer and
/assisted-installer-controller/deploy) to that user, add USER <non-root> before
ENTRYPOINT, and add a HEALTHCHECK instruction that verifies the installer
process (or an appropriate readiness endpoint) so the container reports health.
🪄 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: 601c5b90-c476-4129-8c07-9ff47ed24170
📒 Files selected for processing (2)
.ci-operator.yamlDockerfile.assisted-installer.ocp
| @@ -1,4 +1,4 @@ | |||
| FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.21 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 an approved base image source for the builder stage.
Line 1 uses registry.ci.openshift.org/... instead of an approved UBI minimal/distroless image from catalog.redhat.com, which breaks the container hardening policy.
As per coding guidelines, "Base image: UBI minimal or distroless from catalog.redhat.com".
🤖 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.assisted-installer.ocp` at line 1, The Dockerfile's builder stage
uses an unapproved base image (FROM registry.ci.openshift.org/ocp/...), so
replace that FROM line in the builder stage with an approved UBI minimal or
distroless image from catalog.redhat.com (e.g., the appropriate UBI minimal or
distroless golang-builder image) to comply with the container hardening policy;
update the builder stage reference (builder) and any related image tags to match
the chosen catalog.redhat.com image and ensure any required toolchain or Go
version compatibility is preserved.
Source: Coding guidelines
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #2172 +/- ##
=======================================
Coverage 48.82% 48.82%
=======================================
Files 20 20
Lines 4397 4397
=======================================
Hits 2147 2147
Misses 2026 2026
Partials 224 224 🚀 New features to boost your workflow:
|
|
ART wants to connect issue OCPBUGS-87663 to this PR, but found it is currently hooked up to ['OCPBUGS-87377']. Please consult with #forum-ocp-art if it is not clear what there is to do. |
openshift-bot
added
the
verified
|
@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. |
2 participants
Updating ose-agent-installer-orchestrator-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-agent-installer-orchestrator.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.