From f8518872c8336ee086d7215a72395a72d66968d8 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Sun, 7 Jun 2026 20:24:52 +0000 Subject: [PATCH] UPSTREAM: : Updating ose-azure-cloud-controller-manager-container image to be consistent with ART for 5.0 Reconciling with https://github.com/openshift-eng/ocp-build-data/tree/af322abdd1a4d7d0161a69a16369a0ab1748515a/images/ose-azure-cloud-controller-manager.yml --- .ci-operator.yaml | 2 +- .../images/cloud-controller-manager-openshift.Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index a3628cf240..1d88a59fdf 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/openshift-hack/images/cloud-controller-manager-openshift.Dockerfile b/openshift-hack/images/cloud-controller-manager-openshift.Dockerfile index cf10dcd93f..a4e6f9b77d 100644 --- a/openshift-hack/images/cloud-controller-manager-openshift.Dockerfile +++ b/openshift-hack/images/cloud-controller-manager-openshift.Dockerfile @@ -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/cloud-provider-azure COPY . . RUN make azure-cloud-controller-manager ARCH=$(go env GOARCH) -FROM registry.ci.openshift.org/ocp/4.22:base-rhel9 +FROM registry.ci.openshift.org/ocp/5.0:base-rhel9 COPY --from=builder /go/src/github.com/openshift/cloud-provider-azure/bin/cloud-controller-manager /bin/azure-cloud-controller-manager LABEL description="Azure Cloud Controller Manager"