From c41be910b1da087e3bf709af00a1f0830ee146b4 Mon Sep 17 00:00:00 2001
From: Christian Schlotter <christian.schlotter@broadcom.com>
Date: Thu, 4 Apr 2024 18:53:44 +0200
Subject: [PATCH] go bump

---
 .golangci.yml | 2 +-
 Makefile      | 2 +-
 Tiltfile      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index a3eb71c36cd7..812acedab788 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,6 +1,6 @@
 run:
   timeout: 10m
-  go: "1.21"
+  go: "1.22"
   build-tags:
     - tools
     - e2e
diff --git a/Makefile b/Makefile
index ca6297fbb643..860e3ad47af9 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ SHELL:=/usr/bin/env bash
 #
 # Go.
 #
-GO_VERSION ?= 1.21.9
+GO_VERSION ?= 1.22.2
 GO_DIRECTIVE_VERSION ?= 1.21
 GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)
 
diff --git a/Tiltfile b/Tiltfile
index 3f072e883c6c..810432db8db9 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -184,7 +184,7 @@ def load_provider_tiltfiles():
 
 tilt_helper_dockerfile_header = """
 # Tilt image
-FROM golang:1.21.9 as tilt-helper
+FROM golang:1.22.2 as tilt-helper
 # Install delve. Note this should be kept in step with the Go release minor version.
 RUN go install github.com/go-delve/delve/cmd/dlv@v1.21
 # Support live reloading with Tilt
@@ -195,7 +195,7 @@ RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com
 """
 
 tilt_dockerfile_header = """
-FROM golang:1.21.9 as tilt
+FROM golang:1.22.2 as tilt
 WORKDIR /
 COPY --from=tilt-helper /process.txt .
 COPY --from=tilt-helper /start.sh .