Skip to content

OCPBUGS-87469: Updating openshift-enterprise-hyperkube-container image to be consistent with ART for 5.0 #2684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
openshift-bot wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −3
Open

OCPBUGS-87469: Updating openshift-enterprise-hyperkube-container image to be consistent with ART for 5.0 #2684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
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 openshift-hack/images/hyperkube/Dockerfile.rhel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
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

@coderabbitai coderabbitai Bot Jun 7, 2026

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

Use approved Red Hat catalog base images for both stages.

Both updated FROM lines point to CI registry images instead of catalog.redhat.com UBI/distroless bases required by policy. This weakens provenance/compliance guarantees for production container builds.

As per coding guidelines, "**/{Dockerfile,Containerfile}*: Base image: UBI minimal or distroless from catalog.redhat.com".

Also applies to: 12-12

🤖 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 `@openshift-hack/images/hyperkube/Dockerfile.rhel` at line 1, The Dockerfile
currently uses CI registry images (the "builder" stage FROM
registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0) which
violates the policy; replace both stage base images (the builder stage and the
final/distroless stage) with approved catalog.redhat.com UBI minimal or
distroless images (e.g., catalog.redhat.com/containers/ubi9/ubi-minimal or the
appropriate distroless catalog.redhat.com image) that match the required
runtime/toolchain (Go 1.26) to preserve provenance and compliance; update the
FROM lines accordingly in the Dockerfile so both stages reference
catalog.redhat.com UBI/distroless bases.

Source: Coding guidelines

ARG TAGS=""
WORKDIR /go/src/k8s.io/kubernetes
COPY . .
Expand All @@ -9,7 +9,7 @@ RUN make TAGS="${TAGS}" WHAT='cmd/kube-apiserver cmd/kube-controller-manager cmd
/tmp/build && \
gzip /tmp/build/k8s-tests-ext

FROM registry.ci.openshift.org/ocp/4.22:base-rhel9
FROM registry.ci.openshift.org/ocp/5.0:base-rhel9
RUN yum install -y --setopt=tsflags=nodocs --setopt=skip_missing_names_on_install=False iproute && yum clean all
COPY --from=builder /tmp/build/* /usr/bin/
LABEL io.k8s.display-name="OpenShift Kubernetes Server Commands" \
Expand Down