From 023a2e906b077ad0644226105a04ca15105729ee Mon Sep 17 00:00:00 2001 From: Predrag Rogic Date: Thu, 16 Jan 2025 03:12:36 +0000 Subject: [PATCH 1/5] enable go version update using the check_install_golang script --- go.mod | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.mod b/go.mod index 19afe8ad8929..0e793dc199df 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module k8s.io/minikube go 1.23.0 -toolchain go1.23.4 - require ( cloud.google.com/go/storage v1.48.0 contrib.go.opencensus.io/exporter/stackdriver v0.13.14 From 57ddc49a996f981078c1fb843c9469a4fb9ec52f Mon Sep 17 00:00:00 2001 From: Predrag Rogic Date: Thu, 16 Jan 2025 03:37:44 +0000 Subject: [PATCH 2/5] fix go.mod --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 0e793dc199df..5bbb6ae3cd43 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module k8s.io/minikube -go 1.23.0 +go 1.23.4 require ( cloud.google.com/go/storage v1.48.0 From a7c0a7aae1b0fd0e60845bb7db132943adfb1909 Mon Sep 17 00:00:00 2001 From: Predrag Rogic Date: Sun, 26 Jan 2025 23:47:19 +0000 Subject: [PATCH 3/5] set GOTOOLCHAIN to local in Makefile --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index fe015e5307e3..234d596c54e2 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,9 @@ RPM_REVISION ?= 0 # used by hack/jenkins/release_build_and_upload.sh and KVM_BUILD_IMAGE, see also BUILD_IMAGE below # update this only by running `make update-golang-version` GO_VERSION ?= 1.23.4 +# set GOTOOLCHAIN to local to override the toolchain version specified in go.mod and +# use the one CI hosts has installed (ref: https://go.dev/doc/toolchain#GOTOOLCHAIN) +export GOTOOLCHAIN := local # update this only by running `make update-golang-version` GO_K8S_VERSION_PREFIX ?= v1.33.0 From e5b79a8d7bdc24c050cc045484b37c72e124a7bf Mon Sep 17 00:00:00 2001 From: Predrag Rogic Date: Mon, 27 Jan 2025 00:04:45 +0000 Subject: [PATCH 4/5] set GOTOOLCHAIN to GO_VERSION in Makefile --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 234d596c54e2..64ad7620fac2 100644 --- a/Makefile +++ b/Makefile @@ -36,9 +36,9 @@ RPM_REVISION ?= 0 # used by hack/jenkins/release_build_and_upload.sh and KVM_BUILD_IMAGE, see also BUILD_IMAGE below # update this only by running `make update-golang-version` GO_VERSION ?= 1.23.4 -# set GOTOOLCHAIN to local to override the toolchain version specified in go.mod and -# use the one CI hosts has installed (ref: https://go.dev/doc/toolchain#GOTOOLCHAIN) -export GOTOOLCHAIN := local +# set GOTOOLCHAIN to GO_VERSION to override any toolchain version specified in +# go.mod (ref: https://go.dev/doc/toolchain#GOTOOLCHAIN) +export GOTOOLCHAIN := $(GO_VERSION) # update this only by running `make update-golang-version` GO_K8S_VERSION_PREFIX ?= v1.33.0 From fcfed147a4b3a26197d5ac4dbe56bac52bae49e4 Mon Sep 17 00:00:00 2001 From: Predrag Rogic Date: Mon, 27 Jan 2025 00:07:12 +0000 Subject: [PATCH 5/5] set GOTOOLCHAIN to GO_VERSION in Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 64ad7620fac2..32145e4c81fe 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ RPM_REVISION ?= 0 GO_VERSION ?= 1.23.4 # set GOTOOLCHAIN to GO_VERSION to override any toolchain version specified in # go.mod (ref: https://go.dev/doc/toolchain#GOTOOLCHAIN) -export GOTOOLCHAIN := $(GO_VERSION) +export GOTOOLCHAIN := go$(GO_VERSION) # update this only by running `make update-golang-version` GO_K8S_VERSION_PREFIX ?= v1.33.0