Merge pull request #4809 from richardcase/fix_build

🐛 fix: staging image build failed due to toolchain directive

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

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 (

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