From 1601c68a06acedea4a8e639ef572355b56a7e7b7 Mon Sep 17 00:00:00 2001
From: Christian Schlotter <schlotterc@vmware.com>
Date: Wed, 13 Dec 2023 15:38:57 +0100
Subject: [PATCH] Bump Go to 1.21.5

---
 .golangci.yml     | 2 +-
 Makefile          | 2 +-
 Tiltfile          | 6 +++---
 hack/ensure-go.sh | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 6af1f0ddce21..7249ade91bcf 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,6 +1,6 @@
 run:
   timeout: 10m
-  go: "1.20"
+  go: "1.21"
   build-tags:
     - tools
     - e2e
diff --git a/Makefile b/Makefile
index e77065b74a4a..92c0390ed554 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ SHELL:=/usr/bin/env bash
 #
 # Go.
 #
-GO_VERSION ?= 1.20.12
+GO_VERSION ?= 1.21.5
 GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)
 
 # Use GOPROXY environment variable if set
diff --git a/Tiltfile b/Tiltfile
index 8426af5b37f6..c33221860be5 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -184,9 +184,9 @@ def load_provider_tiltfiles():
 
 tilt_helper_dockerfile_header = """
 # Tilt image
-FROM golang:1.20.12 as tilt-helper
+FROM golang:1.21.5 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.20
+RUN go install github.com/go-delve/delve/cmd/dlv@v1.21
 # Support live reloading with Tilt
 RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/tilt-dev/rerun-process-wrapper/master/restart.sh  && \
     wget --output-document /start.sh --quiet https://raw.githubusercontent.com/tilt-dev/rerun-process-wrapper/master/start.sh && \
@@ -195,7 +195,7 @@ RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com
 """
 
 tilt_dockerfile_header = """
-FROM golang:1.20.12 as tilt
+FROM golang:1.21.5 as tilt
 WORKDIR /
 COPY --from=tilt-helper /process.txt .
 COPY --from=tilt-helper /start.sh .
diff --git a/hack/ensure-go.sh b/hack/ensure-go.sh
index d19b6cd596c5..96f0567f86c5 100755
--- a/hack/ensure-go.sh
+++ b/hack/ensure-go.sh
@@ -38,7 +38,7 @@ EOF
   local go_version
   IFS=" " read -ra go_version <<< "$(go version)"
   local minimum_go_version
-  minimum_go_version=go1.20
+  minimum_go_version=go1.21
   if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then
     cat <<EOF
 Detected go version: ${go_version[*]}.