From d26bc686b3e4fb330bf283ff90257c2aa9fea117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Artur=20=C5=BByli=C5=84ski?= <azylinski@google.com>
Date: Mon, 18 Mar 2024 14:58:31 +0100
Subject: [PATCH] Bump golang to 1.22

---
 .github/workflows/ci.yaml | 2 +-
 builder/Dockerfile        | 4 ++--
 cluster-autoscaler/go.mod | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 1d86e5b5ae7f..8b97185f8c9e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: '1.21.6'
+          go-version: '1.22.1'
 
       - uses: actions/checkout@v2
         with:
diff --git a/builder/Dockerfile b/builder/Dockerfile
index 6e9dd16b93bd..ed308ed2facb 100644
--- a/builder/Dockerfile
+++ b/builder/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.21.8
+FROM golang:1.22.1
 LABEL maintainer="Marcin Wielgus <mwielgus@google.com>"
 
 ENV GOPATH /gopath/
@@ -21,6 +21,6 @@ ENV GO111MODULE auto
 
 RUN apt-get update && apt-get --yes install libseccomp-dev
 RUN go version
-RUN go get github.com/tools/godep
+RUN go install github.com/tools/godep@latest
 RUN godep version
 CMD ["/bin/bash"]
diff --git a/cluster-autoscaler/go.mod b/cluster-autoscaler/go.mod
index 0a1991cc6d5f..2ce7f5d5b4ae 100644
--- a/cluster-autoscaler/go.mod
+++ b/cluster-autoscaler/go.mod
@@ -1,8 +1,8 @@
 module k8s.io/autoscaler/cluster-autoscaler
 
-go 1.21
+go 1.22
 
-toolchain go1.21.8
+toolchain go1.22.1
 
 require (
 	cloud.google.com/go/compute/metadata v0.2.3