Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci-operator.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: rhel-9-release-golang-1.25-openshift-4.22
tag: rhel-9-release-golang-1.26-openshift-5.0
4 changes: 2 additions & 2 deletions Dockerfile.rhel
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
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
WORKDIR /go/src/github.com/openshift/cluster-version-operator
COPY . .
RUN hack/build-go.sh; \
mkdir -p /tmp/build; \
cp _output/linux/$(go env GOARCH)/cluster-version-operator _output/linux/$(go env GOARCH)/cluster-version-operator-tests.gz /tmp/build/

FROM registry.ci.openshift.org/ocp/4.22:base-rhel9-minimal
FROM registry.ci.openshift.org/ocp/5.0:base-rhel9

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major | 🏗️ Heavy lift

Base image regressed from minimal to non-minimal variant.

The runtime base changed from base-rhel9-minimal to base-rhel9, moving away from the minimal variant. As per coding guidelines, container base images should be "UBI minimal or distroless from catalog.redhat.com." While these are OpenShift registry images, the guideline intent is to minimize attack surface and image size. The change increases the container's package footprint and potential vulnerabilities.

If ART requires the non-minimal base for OpenShift 5.0, please confirm this is intentional and document the rationale. Otherwise, consider using registry.ci.openshift.org/ocp/5.0:base-rhel9-minimal if available.

🤖 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` at line 8, The FROM line in Dockerfile.rhel was changed to a
non-minimal image (registry.ci.openshift.org/ocp/5.0:base-rhel9) which increases
footprint; update the Dockerfile.rhel FROM instruction to use the minimal UBI
variant (registry.ci.openshift.org/ocp/5.0:base-rhel9-minimal) to comply with
the "UBI minimal or distroless" guideline, or if OpenShift ART requires the
non-minimal variant, add a short comment and documentation entry explaining why
base-rhel9 is required and who approved it so the change is intentional and
auditable.

Source: Coding guidelines

COPY --from=builder /tmp/build/cluster-version-operator /tmp/build/cluster-version-operator-tests.gz /usr/bin/
COPY install /manifests
COPY vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_* /manifests/
Expand Down