From bc76f88815d4d1a9b105b7257f1ca5a121b47c46 Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Thu, 14 Mar 2024 12:12:47 +0100 Subject: [PATCH] Bump Go to v1.21.8 https://groups.google.com/g/golang-announce/c/5pwGVUPoMbg/m/46oA5yPABQAJ https://go.dev/doc/devel/release#go1.21.8 https://github.com/golang/go/issues?q=milestone%3AGo1.21.8+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 | 2 -- hack/tool/go.mod | 4 +--- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/embedded-bins/Makefile.variables b/embedded-bins/Makefile.variables index 4cced5fb5e18..5259acbace2e 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.21.7 +go_version = 1.21.8 runc_version = 1.1.12 runc_buildimage = $(golang_buildimage) diff --git a/go.mod b/go.mod index c66959582f45..88685e36ddbf 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module github.com/k0sproject/k0s go 1.21.0 -toolchain go1.21.7 - // k0s require ( github.com/BurntSushi/toml v1.3.2 diff --git a/hack/tool/go.mod b/hack/tool/go.mod index a6d4244147b2..c118e9828dbe 100644 --- a/hack/tool/go.mod +++ b/hack/tool/go.mod @@ -1,8 +1,6 @@ module tool -go 1.21 - -toolchain go1.21.7 +go 1.21.0 require ( github.com/hashicorp/terraform-exec v0.20.0