From b1f7899cfc1b4c9f92c74f5987d4d7d4c647b3b9 Mon Sep 17 00:00:00 2001
From: AOS Automation Release Team <noreply@redhat.com>
Date: Sun, 7 Sep 2025 21:58:35 +0000
Subject: [PATCH] Updating openstack-cluster-api-controllers-container image to
 be consistent with ART for 4.21 Reconciling with
 https://github.com/openshift/ocp-build-data/tree/5c68d71385f72cd67a199bc4590068053a833c7d/images/openstack-cluster-api-controllers.yml

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

diff --git a/.ci-operator.yaml b/.ci-operator.yaml
index 461415cbc5..e307e5af66 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.20
+  tag: rhel-9-release-golang-1.24-openshift-4.21
diff --git a/Dockerfile.rhel b/Dockerfile.rhel
index be86a5a0d8..546f98bcad 100644
--- a/Dockerfile.rhel
+++ b/Dockerfile.rhel
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Build the manager binary
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS builder
 WORKDIR /workspace
 
 # Run this with docker build --build_arg goproxy=$(go env GOPROXY) to override the goproxy
@@ -38,7 +38,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} \
     -o manager
 
 # Production image
-FROM registry.ci.openshift.org/ocp/4.20:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
 WORKDIR /
 COPY --from=builder /workspace/manager .
 COPY --from=builder /workspace/infracluster-controller .