From b5d41b1b0bdbd39ab5d1883b797b1086ddda893e Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Sun, 7 Jun 2026 09:41:24 +0000 Subject: [PATCH] Updating ose-cluster-kube-controller-manager-operator-container image to be consistent with ART for 5.0 Reconciling with https://github.com/openshift-eng/ocp-build-data/tree/af322abdd1a4d7d0161a69a16369a0ab1748515a/images/ose-cluster-kube-controller-manager-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 a3628cf24..1d88a59fd 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.25-openshift-4.22 + tag: rhel-9-release-golang-1.26-openshift-5.0 diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7 index 6905bc5d4..6b535dc90 100644 --- a/Dockerfile.rhel7 +++ b/Dockerfile.rhel7 @@ -1,10 +1,10 @@ -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 WORKDIR /go/src/github.com/openshift/cluster-kube-controller-manager-operator COPY . . RUN make build --warn-undefined-variables \ && gzip cluster-kube-controller-manager-operator-tests-ext -FROM registry.ci.openshift.org/ocp/4.22:base-rhel9-minimal +FROM registry.ci.openshift.org/ocp/5.0:base-rhel9 RUN mkdir -p /usr/share/bootkube/manifests/bootstrap-manifests/ /usr/share/bootkube/manifests/config/ /usr/share/bootkube/manifests/manifests/ COPY --from=builder /go/src/github.com/openshift/cluster-kube-controller-manager-operator/bindata/bootkube/bootstrap-manifests /usr/share/bootkube/manifests/bootstrap-manifests/ COPY --from=builder /go/src/github.com/openshift/cluster-kube-controller-manager-operator/bindata/bootkube/config /usr/share/bootkube/manifests/config/