Merge pull request #37 from openshift-bot/art-consistency-openshift-4…

….16-ose-cluster-kube-cluster-api-operator OCPBUGS-28592: Updating ose-cluster-kube-cluster-api-operator-container image to be consistent with ART for 4.16
openshift · Apr 26, 2024 · 95ceaa9 · 95ceaa9
2 parents bddf74a + 45d921a
commit 95ceaa9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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.20-openshift-4.16
+  tag: rhel-9-release-golang-1.21-openshift-4.16
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/cluster-api-operator
 
-go 1.20
+go 1.21
 
 replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.5.1
 

diff --git a/openshift/Dockerfile.openshift b/openshift/Dockerfile.openshift
@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.16 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
 
 WORKDIR /build
 COPY . .