From 55ea16b576d860a44f3116011934ccd78d96d6b0 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Mon, 29 Sep 2025 20:39:26 +0000 Subject: [PATCH] UPSTREAM: : Updating ose-olm-operator-controller-container image to be consistent with ART for 4.21 Reconciling with https://github.com/openshift/ocp-build-data/tree/4fbe3fab45239dc4be6f5d9d98a0bf36e0274ec9/images/ose-olm-operator-controller.yml --- .ci-operator.yaml | 2 +- openshift/operator-controller.Dockerfile | 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/openshift/operator-controller.Dockerfile b/openshift/operator-controller.Dockerfile index db77a7e62..96582906f 100644 --- a/openshift/operator-controller.Dockerfile +++ b/openshift/operator-controller.Dockerfile @@ -1,4 +1,4 @@ -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 ARG SOURCE_GIT_COMMIT ENV GIT_COMMIT=${SOURCE_GIT_COMMIT} @@ -14,7 +14,7 @@ RUN make -f openshift/Makefile go-build-local && \ cp ./bin/olmv1-tests-ext /tmp/build/olmv1-tests-ext && \ gzip -f /tmp/build/olmv1-tests-ext -FROM registry.ci.openshift.org/ocp/4.20:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.21:base-rhel9 USER 1001 COPY --from=builder /build/bin/operator-controller /operator-controller COPY --from=builder /tmp/build/olmv1-tests-ext.gz /usr/bin/olmv1-tests-ext.gz