From e64b47bc08fab62fc70cd8cdf4601600a6ff7123 Mon Sep 17 00:00:00 2001
From: AOS Automation Release Team <noreply@redhat.com>
Date: Tue, 28 Nov 2023 03:58:50 +0000
Subject: [PATCH] UPSTREAM: <carry>: Updating
 ose-azure-cluster-api-controllers-container image to be consistent with ART
 Reconciling with
 https://github.com/openshift/ocp-build-data/tree/9dc2a375bf335e7e4e3d7e75abc5c3bdbb0c0e98/images/ose-azure-cluster-api-controllers.yml

---
 .ci-operator.yaml              | 2 +-
 openshift/Dockerfile.openshift | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.ci-operator.yaml b/.ci-operator.yaml
index 7cd14bfef5b..7096df34e37 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/Dockerfile.openshift b/openshift/Dockerfile.openshift
index da096d6e4eb..cc69afd3bd3 100644
--- a/openshift/Dockerfile.openshift
+++ b/openshift/Dockerfile.openshift
@@ -1,4 +1,4 @@
-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 /build
 COPY . .
@@ -7,7 +7,7 @@ RUN GO111MODULE=on CGO_ENABLED=0 GOOS=${GOOS} GOPROXY=${GOPROXY} go build \
   -o=cluster-api-provider-azure-controller-manager \
   main.go
 
-FROM registry.ci.openshift.org/ocp/4.15:base
+FROM registry.ci.openshift.org/ocp/4.15:base-rhel9
 
 LABEL description="Cluster API Provider Azure Controller Manager"