From a5e5acb7cc1e48c240e58983af668ff80d5749af Mon Sep 17 00:00:00 2001
From: Richard Case <richard.case@suse.com>
Date: Thu, 22 Feb 2024 14:39:06 +0000
Subject: [PATCH] fix: toolchain directive is causing build failure

Signed-off-by: Richard Case <richard.case@suse.com>
---
 cloudbuild.yaml   | 7 ++++---
 go.mod            | 2 --
 hack/tools/go.mod | 2 --
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index f8a71c1b0c..bd4d11a0c5 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -2,15 +2,16 @@
 timeout: 3000s
 options:
   substitution_option: ALLOW_LOOSE
+  machineType: 'E2_HIGHCPU_8'
 steps:
-  - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20220609-2e4c91eb7e'
+  - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20230522-312425ae46'
     entrypoint: make
     env:
     - DOCKER_CLI_EXPERIMENTAL=enabled
     - TAG=$_GIT_TAG
     - PULL_BASE_REF=$_PULL_BASE_REF
-    args:
-    - release-staging
+    - DOCKER_BUILDKIT=1
+    args: ['release-staging', '-j', '8', '-O']
 substitutions:
   # _GIT_TAG will be filled with a git-based tag for the image, of the form vYYYYMMDD-hash, and
   # can be used as a substitution
diff --git a/go.mod b/go.mod
index f3c5180110..540a7aa812 100644
--- a/go.mod
+++ b/go.mod
@@ -2,8 +2,6 @@ module sigs.k8s.io/cluster-api-provider-aws/v2
 
 go 1.21
 
-toolchain go1.21.7
-
 replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.5.3
 
 require (
diff --git a/hack/tools/go.mod b/hack/tools/go.mod
index a7f908733a..c527c0a64b 100644
--- a/hack/tools/go.mod
+++ b/hack/tools/go.mod
@@ -2,8 +2,6 @@ module sigs.k8s.io/cluster-api-provider-aws/hack/tools
 
 go 1.21
 
-toolchain go1.21.7
-
 require (
 	github.com/a8m/envsubst v1.4.2
 	github.com/ahmetb/gen-crd-api-reference-docs v0.3.0