From 26ff8026791fd54e829adbbdabdaa22b9062ca6d Mon Sep 17 00:00:00 2001
From: AOS Automation Release Team <noreply@redhat.com>
Date: Tue, 28 Nov 2023 22:34:30 +0000
Subject: [PATCH] UPSTREAM: <carry>: Updating
 ose-azure-cloud-controller-manager-container image to be consistent with ART
 Reconciling with
 https://github.com/openshift/ocp-build-data/tree/9dc2a375bf335e7e4e3d7e75abc5c3bdbb0c0e98/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 7cd14bfef5..7096df34e3 100644
--- a/.ci-operator.yaml
+++ b/.ci-operator.yaml
@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-8-release-golang-1.20-openshift-4.15
+  tag: rhel-9-release-golang-1.20-openshift-4.15
diff --git a/openshift-hack/images/cloud-controller-manager-openshift.Dockerfile b/openshift-hack/images/cloud-controller-manager-openshift.Dockerfile
index 093981a76f..449d215630 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-8-golang-1.20-openshift-4.15 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15 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.15:base
+FROM registry.ci.openshift.org/ocp/4.15: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"