From 9fc2342e544590ba5d07778455cedbb036a42bb0 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Thu, 18 Sep 2025 19:29:31 +0000 Subject: [PATCH] Updating ose-openshift-controller-manager-container image to be consistent with ART for 4.21 Reconciling with https://github.com/openshift/ocp-build-data/tree/22bf27a3a0b8820aa8d338d6be20972a7c5109ca/images/ose-openshift-controller-manager.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 461415cbc..e307e5af6 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.20 + tag: rhel-9-release-golang-1.24-openshift-4.21 diff --git a/Dockerfile.rhel b/Dockerfile.rhel index 147638984..983c82235 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.20 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS builder WORKDIR /go/src/github.com/openshift/openshift-controller-manager COPY . . RUN make build --warn-undefined-variables \ && make tests-ext-build \ && gzip openshift-controller-manager-tests-ext -FROM registry.ci.openshift.org/ocp/4.20:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.21:base-rhel9 COPY --from=builder /go/src/github.com/openshift/openshift-controller-manager/openshift-controller-manager /usr/bin/ COPY --from=builder /go/src/github.com/openshift/openshift-controller-manager/openshift-controller-manager-tests-ext.gz /usr/bin/ LABEL io.k8s.display-name="OpenShift Controller Manager Command" \