From dfc02ff4936fb39f754a173992ab75dc7804fe13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan-Luis=20de=20Sousa-Valadas=20Casta=C3=B1o?=
 <jvaladas@mirantis.com>
Date: Thu, 29 Aug 2024 12:39:43 +0200
Subject: [PATCH] Bump go version to 1.22.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes:
* CVE-2024-24791
* CVE-2024-24790
* CVE-2024-24789
* CVE-2024-24788
* CVE-2024-24787
* CVE-2024-24785
* CVE-2024-24783
* CVE-2023-45288
* CVE-2023-45285
* CVE-2023-45284
* CVE-2023-45283
* CVE-2023-39326

Signed-off-by: Juan-Luis de Sousa-Valadas Castaño <jvaladas@mirantis.com>
---
 .github/workflows/lint.yml    | 2 +-
 .github/workflows/release.yml | 2 +-
 Makefile.variables            | 2 +-
 go.mod                        | 2 +-
 inttest/Makefile.variables    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 297514829..4ba4004db 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21.1'
+          go-version: '1.22.6'
 
       - name: Go caches
         uses: actions/cache@v4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 44cbd371a..30499b7da 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -50,7 +50,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21.1'
+          go-version: '1.22.6'
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
diff --git a/Makefile.variables b/Makefile.variables
index d2ff7f92e..a3b4f9290 100644
--- a/Makefile.variables
+++ b/Makefile.variables
@@ -1,5 +1,5 @@
 KUSTOMIZE_VERSION ?= v5.0.1
 CONTROLLER_TOOLS_VERSION ?= v0.14.0
-GO_VERSION ?= 1.21.1
+GO_VERSION ?= 1.22.6
 GOLANGCILINT_VERSION ?= 1.52.2
 CRDOC_VERSION ?= v0.6.2
diff --git a/go.mod b/go.mod
index 5857a8017..bba2dd910 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/k0sproject/k0smotron
 
-go 1.21
+go 1.22
 
 require (
 	github.com/cloudflare/cfssl v1.6.4
diff --git a/inttest/Makefile.variables b/inttest/Makefile.variables
index 772934115..4ce130ad7 100644
--- a/inttest/Makefile.variables
+++ b/inttest/Makefile.variables
@@ -1,7 +1,7 @@
 alpine_version = 3.18
 alpine_patch_version = $(alpine_version).2
 golang_buildimage=docker.io/library/golang:$(go_version)-alpine$(alpine_version)
-go_version = 1.21.3
+go_version = 1.22.6
 kubernetes_version=1.27.2
 
 smoketests := \