From 53a9b8f1f743c8b509c47a238c0a44fc61131b5a Mon Sep 17 00:00:00 2001
From: Janne Kataja <janne.kataja@sdx.com>
Date: Thu, 22 Aug 2024 18:43:35 +0200
Subject: [PATCH] bump go to 1.22.6

Signed-off-by: Janne Kataja <janne.kataja@sdx.com>
---
 Dockerfile                  | 4 ++--
 Tiltfile                    | 2 +-
 go.mod                      | 2 +-
 hack/build-image/Dockerfile | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2c70dd4562..53c0fc92a6 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.22.6-bookworm AS velero-builder
 
 ARG GOPROXY
 ARG BIN
@@ -47,7 +47,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.22.6-bookworm AS restic-builder
 
 ARG BIN
 ARG TARGETOS
diff --git a/Tiltfile b/Tiltfile
index 994f27717a..cf07e1913b 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.22.6 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 bef073147e..497e688a8a 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/velero
 
-go 1.22.0
+go 1.22.6
 
 require (
 	cloud.google.com/go/storage v1.40.0
diff --git a/hack/build-image/Dockerfile b/hack/build-image/Dockerfile
index fb72a5290c..799be57361 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.22.6-bookworm
 
 ARG GOPROXY
 
@@ -102,4 +102,4 @@ RUN chmod +x ./kubectl
 RUN mv ./kubectl /usr/local/bin
 
 # Fix the "dubious ownership" issue from git when running goreleaser.sh
-RUN echo "[safe] \n\t directory = *" > /.gitconfig
\ No newline at end of file
+RUN echo "[safe] \n\t directory = *" > /.gitconfig