From 04a0a57df92e13d1fee9635ece72b34c36479789 Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Fri, 25 Oct 2024 12:41:39 +0200 Subject: [PATCH] Bump Go to v1.23.2 https://groups.google.com/g/golang-announce/c/RQjbRNOcV74/m/N72mEv9ECAAJ https://go.dev/doc/go1.23 Signed-off-by: Tom Wieczorek --- build/Dockerfile | 2 +- embedded-bins/Makefile.variables | 2 +- go.mod | 2 +- hack/tool/go.mod | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 5a39abe9e8d2..d44e391d4b8e 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -4,7 +4,7 @@ FROM $BUILDIMAGE ARG TARGETARCH RUN set -ex; \ # Need to use the gold linker on ARM, Go really wants to have it. -# https://github.com/golang/go/blob/go1.22.4/src/cmd/link/internal/ld/lib.go#L1622-L1641 +# https://github.com/golang/go/blob/go1.23.2/src/cmd/link/internal/ld/lib.go##L1661-L1680 case "$TARGETARCH" in \ arm*) binutils=binutils-gold ;; \ *) binutils=binutils ;; \ diff --git a/embedded-bins/Makefile.variables b/embedded-bins/Makefile.variables index 799d6d36fd64..4d7912fda9ed 100644 --- a/embedded-bins/Makefile.variables +++ b/embedded-bins/Makefile.variables @@ -1,7 +1,7 @@ alpine_version = 3.20 alpine_patch_version = $(alpine_version).1 golang_buildimage=docker.io/library/golang:$(go_version)-alpine$(alpine_version) -go_version = 1.22.7 +go_version = 1.23.2 runc_version = 1.1.15 runc_buildimage = $(golang_buildimage) diff --git a/go.mod b/go.mod index 9ad3788dccac..f3c48428f4be 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/k0sproject/k0s -go 1.22.0 +go 1.23 // k0s require ( diff --git a/hack/tool/go.mod b/hack/tool/go.mod index dbc25bdd7e7e..68742756392e 100644 --- a/hack/tool/go.mod +++ b/hack/tool/go.mod @@ -1,6 +1,6 @@ module tool -go 1.22.0 +go 1.23 require ( github.com/hashicorp/terraform-exec v0.21.0