From 3bcc5a83ae30824c06ac276f30dd74ec75c2e3a5 Mon Sep 17 00:00:00 2001
From: Thomas Ferrandiz <thomas.ferrandiz@suse.com>
Date: Tue, 10 Sep 2024 09:16:25 +0000
Subject: [PATCH] Bump go to 1.22

---
 .github/workflows/buildTests.yaml | 2 +-
 .github/workflows/release.yml     | 2 +-
 Makefile                          | 2 +-
 go.mod                            | 2 +-
 scripts/version.sh                | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/buildTests.yaml b/.github/workflows/buildTests.yaml
index 2c641ec..ffd371a 100644
--- a/.github/workflows/buildTests.yaml
+++ b/.github/workflows/buildTests.yaml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: [ "1.21.11" ]
+        go: [ "1.22.7" ]
     steps:
     - name: Check out code into the Go module directory
       uses: actions/checkout@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e67ddce..c291815 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ on:
       - created
 
 env:
-  GO_VERSION: "1.21.11"
+  GO_VERSION: "1.22.7"
   REPOSITORY: flannel/flannel-cni-plugin
 
 jobs:
diff --git a/Makefile b/Makefile
index fa644cc..5db1b4d 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ else
 endif
 
 # Go version to use for builds. Can be overridden
-GOLANG_VERSION?=1.21.11
+GOLANG_VERSION?=1.22.7
 
 build_all: vendor build_all_linux build_windows
 	@echo "All arches should be built for $(TAG)"
diff --git a/go.mod b/go.mod
index 011f912..cb2fcd4 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/flannel-io/cni-plugin
 
-go 1.21
+go 1.22
 
 require (
 	github.com/containernetworking/cni v1.2.3
diff --git a/scripts/version.sh b/scripts/version.sh
index 9f67c8a..4c8f4b0 100755
--- a/scripts/version.sh
+++ b/scripts/version.sh
@@ -34,7 +34,7 @@ PLATFORM=${GOOS}-${GOARCH}
 RELEASE=${PROG}-${GOARCH}
 # hardcode versions unless set specifically
 VERSION=${VERSION:-v1.0.0}
-GOLANG_VERSION=${GOLANG_VERSION:-1.21.9}
+GOLANG_VERSION=${GOLANG_VERSION:-1.22.7}
 
 if [ -d .git ]; then
     if [ -z "${GIT_TAG}" ]; then