From 8a3d477c049424fc76d35432a029ad3afb88c803 Mon Sep 17 00:00:00 2001
From: Janne Kataja <janne.kataja@sdx.com>
Date: Thu, 29 Aug 2024 15:33:13 +0200
Subject: [PATCH] chore: update Go to 1.23 and toolchain to 1.23.6

Signed-off-by: Janne Kataja <janne.kataja@sdx.com>

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
---
 Dockerfile                  | 4 ++--
 Dockerfile-Windows          | 2 +-
 Tiltfile                    | 2 +-
 go.mod                      | 4 ++--
 hack/build-image/Dockerfile | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3ce8f60036..46238a9cf9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Velero binary build section
-FROM --platform=$BUILDPLATFORM golang:1.22-bookworm AS velero-builder
+FROM --platform=$BUILDPLATFORM golang:1.23-bookworm AS velero-builder
 
 ARG GOPROXY
 ARG BIN
@@ -49,7 +49,7 @@ RUN mkdir -p /output/usr/bin && \
     go clean -modcache -cache
 
 # Restic binary build section
-FROM --platform=$BUILDPLATFORM golang:1.22-bookworm AS restic-builder
+FROM --platform=$BUILDPLATFORM golang:1.23-bookworm AS restic-builder
 
 ARG GOPROXY
 ARG BIN
diff --git a/Dockerfile-Windows b/Dockerfile-Windows
index ec60e1e8b1..4042ed403f 100644
--- a/Dockerfile-Windows
+++ b/Dockerfile-Windows
@@ -15,7 +15,7 @@
 ARG OS_VERSION=1809
 
 # Velero binary build section
-FROM --platform=$BUILDPLATFORM golang:1.22-bookworm AS velero-builder
+FROM --platform=$BUILDPLATFORM golang:1.23-bookworm AS velero-builder
 
 ARG GOPROXY
 ARG BIN
diff --git a/Tiltfile b/Tiltfile
index 994f27717a..39de3b43e1 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -52,7 +52,7 @@ git_sha = str(local("git rev-parse HEAD", quiet = True, echo_off = True)).strip(
 
 tilt_helper_dockerfile_header = """
 # Tilt image
-FROM golang:1.22 as tilt-helper
+FROM golang:1.23 as tilt-helper
 
 # Support live reloading with Tilt
 RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh  && \
diff --git a/go.mod b/go.mod
index 2734c7fbf9..5553a082e6 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,8 @@
 module github.com/vmware-tanzu/velero
 
-go 1.22.0
+go 1.23
 
-toolchain go1.22.11
+toolchain go1.23.6
 
 require (
 	cloud.google.com/go/storage v1.47.0
diff --git a/hack/build-image/Dockerfile b/hack/build-image/Dockerfile
index c5127faa7c..54fbb96edd 100644
--- a/hack/build-image/Dockerfile
+++ b/hack/build-image/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM --platform=$TARGETPLATFORM golang:1.22-bookworm
+FROM --platform=$TARGETPLATFORM golang:1.23-bookworm
 
 ARG GOPROXY