From b4cfe863979a619ae25c5629d1de9ab54090d825 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Thu, 15 Jan 2026 14:36:12 +0000 Subject: [PATCH 1/2] Updating cluster-version-operator-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/395c83a78c691c68d4ec99cb4a81d768cb69ecec/images/cluster-version-operator.yml --- .ci-operator.yaml | 2 +- Dockerfile.rhel | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index e307e5af66..a3628cf240 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: rhel-9-release-golang-1.24-openshift-4.21 + tag: rhel-9-release-golang-1.25-openshift-4.22 diff --git a/Dockerfile.rhel b/Dockerfile.rhel index 26c7e6c6ff..df40d2734a 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -1,11 +1,11 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 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.21:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.22:base-rhel9-minimal 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/ From 42e945c3efcf6d371ed73309fa98c1d1390cfce4 Mon Sep 17 00:00:00 2001 From: Hongkai Liu Date: Fri, 16 Jan 2026 15:12:27 +0800 Subject: [PATCH 2/2] Use base-rhel9 before base-rhel9-minimal is ready The image is not yet ready [1]. [1]. https://issues.redhat.com/browse/ART-14372?focusedId=28833826&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-28833826 --- Dockerfile.rhel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.rhel b/Dockerfile.rhel index df40d2734a..adc13ece2e 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -5,7 +5,7 @@ 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/4.22:base-rhel9 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/