From 37a9621a2b0bd2d013147817feb9ee93f663331a Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Thu, 14 Mar 2024 12:07:47 +0100 Subject: [PATCH] Bump Go to v1.22.1 https://groups.google.com/g/golang-announce/c/5pwGVUPoMbg/m/46oA5yPABQAJ https://go.dev/doc/devel/release#go1.22.1 https://github.com/golang/go/issues?q=milestone%3AGo1.22.1+label%3ACherryPickApproved Fixes CVE-2024-24783, CVE-2023-45290, CVE-2023-45289, CVE-2024-24785 and CVE-2024-24784. Signed-off-by: Tom Wieczorek --- embedded-bins/Makefile.variables | 2 +- go.mod | 4 +--- hack/tool/go.mod | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/embedded-bins/Makefile.variables b/embedded-bins/Makefile.variables index d314286e88cf..abedd0f8e2c7 100644 --- a/embedded-bins/Makefile.variables +++ b/embedded-bins/Makefile.variables @@ -1,7 +1,7 @@ alpine_version = 3.19 alpine_patch_version = $(alpine_version).0 golang_buildimage=docker.io/library/golang:$(go_version)-alpine$(alpine_version) -go_version = 1.22.0 +go_version = 1.22.1 runc_version = 1.1.12 runc_buildimage = $(golang_buildimage) diff --git a/go.mod b/go.mod index 8e7d2a853e4f..d234ea527359 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/k0sproject/k0s -go 1.22 - -toolchain go1.22.0 +go 1.22.0 // k0s require ( diff --git a/hack/tool/go.mod b/hack/tool/go.mod index 6568d4186d40..dc7f4e223d54 100644 --- a/hack/tool/go.mod +++ b/hack/tool/go.mod @@ -1,8 +1,6 @@ module tool -go 1.22 - -toolchain go1.22.0 +go 1.22.0 require ( github.com/hashicorp/terraform-exec v0.20.0