OCPBUGS-87360: Updating ose-machine-api-operator-container image to be consistent with ART for 5.0#1507
Conversation
485713c to
f2ac957
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 |
WalkthroughThe PR updates base image tags and Go version references across the CI configuration and Dockerfile. The ChangesBase Image and Build Version Updates
Estimated code review effort🎯 1 (Trivial) | ⏱️ ~3 minutes Possibly related PRs
Suggested labels
Suggested reviewers
Important Pre-merge checks failedPlease resolve all errors before merging. Addressing warnings is optional. ❌ Failed checks (1 error, 1 warning)
✅ Passed checks (13 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
|
@openshift-bot: This pull request references Jira Issue OCPBUGS-87360, 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: 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-87360, 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.
🧹 Nitpick comments (1)
Dockerfile.rhel (1)
1-21: ⚡ Quick winMissing USER directive violates container security guidelines.
The Dockerfile does not include a
USERdirective, causing the container to run as root. This violates the coding guidelines requirement: "USER non-root; never run as root."While this is a pre-existing issue (not introduced by this PR), it should be addressed to comply with container security best practices. Note that if the machine-api-operator requires root privileges for its operations, this should be explicitly documented and justified.
As per coding guidelines: "USER non-root; never run as root" from the container security (prodsec-skills) requirements.
🔒 Proposed fix to add non-root USER
FROM registry.ci.openshift.org/ocp/5.0:base-rhel9 COPY --from=builder /go/src/github.com/openshift/machine-api-operator/install manifests COPY --from=builder /go/src/github.com/openshift/machine-api-operator/bin/machine-api-operator . COPY --from=builder /go/src/github.com/openshift/machine-api-operator/bin/nodelink-controller . COPY --from=builder /go/src/github.com/openshift/machine-api-operator/bin/machine-healthcheck . COPY --from=builder /go/src/github.com/openshift/machine-api-operator/bin/machineset ./machineset-controller COPY --from=builder /go/src/github.com/openshift/machine-api-operator/bin/vsphere ./machine-controller-manager COPY --from=builder /tmp/build/machine-api-tests-ext.gz . + +USER 1001 LABEL io.k8s.display-name="OpenShift Machine API Operator" \ io.openshift.release.operator=true \ io.openshift.tags="openshift,tests,e2e,e2e-extension"Note: Verify that UID 1001 (or another non-root user) is appropriate for the operator's runtime requirements.
🤖 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.rhel` around lines 1 - 21, Add a non-root USER in the final image and ensure the copied artifacts are owned/accessible by that user: in the Dockerfile adjust the final stage (after COPY --from=builder ... lines) to create or choose a non-root user/UID (e.g., 1001), chown the installed files and binaries (install manifests, machine-api-operator, nodelink-controller, machine-healthcheck, machineset-controller, machine-controller-manager, and machine-api-tests-ext.gz) to that user and then set USER to it; verify file permissions allow execution where needed and document if root is actually required.Sources: Coding guidelines, Linters/SAST tools
🤖 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.
Nitpick comments:
In `@Dockerfile.rhel`:
- Around line 1-21: Add a non-root USER in the final image and ensure the copied
artifacts are owned/accessible by that user: in the Dockerfile adjust the final
stage (after COPY --from=builder ... lines) to create or choose a non-root
user/UID (e.g., 1001), chown the installed files and binaries (install
manifests, machine-api-operator, nodelink-controller, machine-healthcheck,
machineset-controller, machine-controller-manager, and machine-api-tests-ext.gz)
to that user and then set USER to it; verify file permissions allow execution
where needed and document if root is actually required.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml
Review profile: CHILL
Plan: Enterprise
Run ID: 889c4a5e-0a4d-4f8b-bcf1-62b3584c280c
📒 Files selected for processing (2)
.ci-operator.yamlDockerfile.rhel
|
@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. |
Updating ose-machine-api-operator-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-machine-api-operator.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.Summary by CodeRabbit
Release Notes