From 123927a779abae5f060a51d6b496aca94b05d468 Mon Sep 17 00:00:00 2001
From: Joseph Anttila Hall <joseph.hall@gmail.com>
Date: Mon, 29 Apr 2024 11:17:15 -0700
Subject: [PATCH] Update golang to 1.22.

(Defer konnectivity-client to separate PR).
---
 .github/workflows/e2e.yaml | 3 +--
 Makefile                   | 2 +-
 go.mod                     | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 0d248be3f..03deb7379 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -12,7 +12,6 @@ on:
 
 env:
   GO_TOOLCHAIN: "golang"
-  GO_VERSION: "1.21.6"
   # TODO: match BASEIMAGE with Makefile default (nonroot variant)
   BASEIMAGE: "gcr.io/distroless/static-debian11"
   KIND_CLUSTER_NAME: "kind"
@@ -25,7 +24,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: ${{ env.GO_VERSION }}
+        go-version-file: go.mod
       id: go
 
     - name: Check out code
diff --git a/Makefile b/Makefile
index 4d5bd05a6..0307db9c8 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ ALL_ARCH ?= amd64 arm arm64 ppc64le s390x
 # The output type could either be docker (local), or registry.
 OUTPUT_TYPE ?= docker
 GO_TOOLCHAIN ?= golang
-GO_VERSION ?= 1.21.9
+GO_VERSION ?= 1.22.2
 BASEIMAGE ?= gcr.io/distroless/static-debian11:nonroot
 
 ifeq ($(GOPATH),)
diff --git a/go.mod b/go.mod
index afd6e2603..b828f1819 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/apiserver-network-proxy
 
-go 1.21
+go 1.22
 
 require (
 	github.com/google/uuid v1.6.0