From 075352a944a5612d23cca3948db4a6dbab6339fb Mon Sep 17 00:00:00 2001
From: Damiano Donati <damiano.donati@gmail.com>
Date: Fri, 24 Jan 2025 17:17:40 +0100
Subject: [PATCH] Revert "Revert "chore: bump golang to 1.23.5""

---
 .github/workflows/lint.yml | 2 +-
 Dockerfile                 | 2 +-
 Makefile                   | 2 +-
 go.mod                     | 2 +-
 hack/tools/go.mod          | 2 +-
 netlify.toml               | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index d9b4a1f4b..0d1da04ef 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -18,7 +18,7 @@ jobs:
 
       - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
         with:
-          go-version: "1.22"
+          go-version: "1.23"
           check-latest: true
           cache: false
 
diff --git a/Dockerfile b/Dockerfile
index dfa677aeb..4ea636eb3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Build the manager binary
-FROM golang:1.22.11@sha256:d5b17d684180648e16ea974bea677498945e8b619f7b26325958d8d99e97f9ea as builder
+FROM golang:1.23.5@sha256:8c10f21bec412f08f73aa7b97ca5ac5f28a39d8a88030ad8a339fd0a781d72b4 as builder
 WORKDIR /workspace
 
 # Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy
diff --git a/Makefile b/Makefile
index 7720cf67c..43341fadc 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ export GOPROXY
 export GO111MODULE=on
 
 # Go version
-GOLANG_VERSION := 1.22.11
+GOLANG_VERSION := 1.23.5
 
 # Kubebuilder
 export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.31.0
diff --git a/go.mod b/go.mod
index d26789364..9ef596522 100644
--- a/go.mod
+++ b/go.mod
@@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-gcp
 
 go 1.22.0
 
-toolchain go1.22.8
+toolchain go1.23.5
 
 replace (
 	// cel-go should match the version imported by CAPI.
diff --git a/hack/tools/go.mod b/hack/tools/go.mod
index 8778bc514..b7f07d379 100644
--- a/hack/tools/go.mod
+++ b/hack/tools/go.mod
@@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-gcp/hack/tools
 
 go 1.22.0
 
-toolchain go1.22.8
+toolchain go1.23.5
 
 replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.4
 
diff --git a/netlify.toml b/netlify.toml
index c346207b2..fe1d4ee08 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -4,7 +4,7 @@
     publish = "docs/book/book"
 
 [build.environment]
-    GO_VERSION = "1.21.10"
+    GO_VERSION = "1.23.5"
 
 # Standard Netlify redirects
 [[redirects]]