From ca6c4f490d9310d00f83f7c527e6033a073de7a6 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Tue, 3 Mar 2026 01:51:50 +0000 Subject: [PATCH] UPSTREAM: : Updating ose-cluster-config-operator-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/992b0dc3f0e12d86e7466dadf1eb51b2584a9a83/images/ose-cluster-config-operator.yml --- .ci-operator.yaml | 2 +- Dockerfile.rhel7 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 284a91009..a3628cf24 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.22 + tag: rhel-9-release-golang-1.25-openshift-4.22 diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7 index b496c8518..feac7d2e5 100644 --- a/Dockerfile.rhel7 +++ b/Dockerfile.rhel7 @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS builder ARG TAGS="" WORKDIR /go/src/github.com/openshift/cluster-config-operator COPY . . @@ -6,7 +6,7 @@ ENV GO_PACKAGE github.com/openshift/cluster-config-operator RUN make build --warn-undefined-variables \ && gzip cluster-config-operator-tests-ext -FROM registry.ci.openshift.org/ocp/4.22:base-rhel9-minimal +FROM registry.ci.openshift.org/ocp/4.22:base-rhel9 RUN mkdir -p /usr/share/bootkube/manifests/manifests RUN mkdir -p /usr/share/bootkube/manifests/bootstrap-manifests COPY --from=builder /go/src/github.com/openshift/cluster-config-operator/cluster-config-operator /usr/bin/