From 0dd8ba0371bfc3098aa08763b9c14410688b4211 Mon Sep 17 00:00:00 2001
From: Thomas Ferrandiz <thomas.ferrandiz@suse.com>
Date: Wed, 4 Sep 2024 12:47:05 +0000
Subject: [PATCH] Upgrade go version to 1.22

---
 .github/workflows/build.yaml          | 2 +-
 .github/workflows/codeql-analysis.yml | 2 +-
 .github/workflows/e2eTests.yaml       | 2 +-
 .github/workflows/golangci-lint.yaml  | 2 +-
 .github/workflows/k3s-e2eTests.yml    | 2 +-
 .github/workflows/release.yml         | 2 +-
 .github/workflows/trivy.yml           | 2 +-
 Makefile                              | 2 +-
 go.mod                                | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 220a8671ed..9e69db6812 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -3,7 +3,7 @@ name: build flannel
 on: [push, pull_request]
 
 env:
-  GO_VERSION: "1.21"
+  GO_VERSION: "1.22"
   LINUX_ARCHES: "amd64 arm arm64 s390x ppc64le riscv64"
   REPOSITORY: flannel/flannel
 
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 521683cefc..0bb7c30bcb 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -21,7 +21,7 @@ on:
     - cron: '30 20 * * 0'
 
 env:
-  GO_VERSION: "1.21"
+  GO_VERSION: "1.22"
 
 jobs:
   analyze:
diff --git a/.github/workflows/e2eTests.yaml b/.github/workflows/e2eTests.yaml
index e0bd8590e4..8ad6e6c97c 100644
--- a/.github/workflows/e2eTests.yaml
+++ b/.github/workflows/e2eTests.yaml
@@ -10,7 +10,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v5
       with:
-        go-version: ^1.21
+        go-version: ^1.22
     - name: Check out code into the Go module directory
       uses: actions/checkout@v4
     - name: Run tests
diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml
index bec654d25e..6522e84a78 100644
--- a/.github/workflows/golangci-lint.yaml
+++ b/.github/workflows/golangci-lint.yaml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.22"
           cache: false
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v4.0.0
diff --git a/.github/workflows/k3s-e2eTests.yml b/.github/workflows/k3s-e2eTests.yml
index 0a453db037..f0a209f13d 100644
--- a/.github/workflows/k3s-e2eTests.yml
+++ b/.github/workflows/k3s-e2eTests.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 env:
   ARCH: amd64
-  GO_VERSION: "1.21"
+  GO_VERSION: "1.22"
   KUBECONFIG: ${HOME}/.kube/config
 
 jobs:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 486dc4b3bd..f345d4e3b8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,7 +5,7 @@ on:
     types: [published]
 
 env:
-  GO_VERSION: "1.21"
+  GO_VERSION: "1.22"
   LINUX_ARCHES: "amd64 arm arm64 s390x ppc64le riscv64"
   REPOSITORY: flannel/flannel
 
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
index 0588580006..3bcce161dc 100644
--- a/.github/workflows/trivy.yml
+++ b/.github/workflows/trivy.yml
@@ -15,7 +15,7 @@ on:
     - cron: '34 5 * * 2'
 
 env:
-  GO_VERSION: "1.21"
+  GO_VERSION: "1.22"
   REPOSITORY: flannel/flannel
 
 permissions:
diff --git a/Makefile b/Makefile
index 7d79294807..fd61bfe4af 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ else
 endif
 
 # Go version to use for builds
-GO_VERSION=1.21
+GO_VERSION=1.22
 
 # K8s version used for Makefile helpers
 K8S_VERSION=1.24.6
diff --git a/go.mod b/go.mod
index f510a4c428..4ec51fdfad 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/flannel-io/flannel
 
-go 1.21
+go 1.22
 
 // replace github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.2.0