From 285f6a1dce66ea76b8b3e50899dcc1d901834d2d Mon Sep 17 00:00:00 2001
From: AOS Automation Release Team <noreply@redhat.com>
Date: Thu, 21 Mar 2024 14:03:10 -0400
Subject: [PATCH] Updating openstack-cluster-api-controllers-container image to
 be consistent with ART for 4.16 Reconciling with
 https://github.com/openshift/ocp-build-data/tree/4ed20fa03140921c690a59b3d0121a5febfdfdde/images/openstack-cluster-api-controllers.yml

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

diff --git a/.ci-operator.yaml b/.ci-operator.yaml
index 38718883ba..a83f0f8430 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.21-openshift-4.16
+  tag: rhel-9-release-golang-1.21-openshift-4.16
diff --git a/Dockerfile.rhel b/Dockerfile.rhel
index 3c1e8d9e9f..cacb219c7a 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-8-golang-1.21-openshift-4.16 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 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.16:base
+FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
 WORKDIR /
 COPY --from=builder /workspace/manager .
 COPY --from=builder /workspace/infracluster-controller .
diff --git a/go.mod b/go.mod
index 997f835404..4c59f8ec77 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/cluster-api-provider-openstack
 
-go 1.20
+go 1.21
 
 require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc