From 7db4ef216488e82234a15675d3ed8449800fee45 Mon Sep 17 00:00:00 2001 From: pratik-mahalle Date: Fri, 5 Sep 2025 07:32:31 +0530 Subject: [PATCH 1/2] fix: bump go to v1.24.7 Signed-off-by: pratik-mahalle --- Makefile | 2 +- Tiltfile | 4 ++-- docs/release/role-handbooks/release-lead/README.md | 2 +- netlify.toml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b710a2061107..4204cf932bd8 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ SHELL:=/usr/bin/env bash # # Go. # -GO_VERSION ?= 1.24.6 +GO_VERSION ?= 1.24.7 GO_DIRECTIVE_VERSION ?= 1.24.0 GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION) diff --git a/Tiltfile b/Tiltfile index d07c92b1d671..6652c8f4c6cb 100644 --- a/Tiltfile +++ b/Tiltfile @@ -172,7 +172,7 @@ def load_provider_tilt_files(): tilt_helper_dockerfile_header = """ # Tilt image -FROM golang:1.24.6 as tilt-helper +FROM golang:1.24.7 as tilt-helper # Install delve. Note this should be kept in step with the Go release minor version. RUN go install github.com/go-delve/delve/cmd/dlv@v1.24 # Support live reloading with Tilt @@ -183,7 +183,7 @@ RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com """ tilt_dockerfile_header = """ -FROM golang:1.24.6 as tilt +FROM golang:1.24.7 as tilt WORKDIR / COPY --from=tilt-helper /process.txt . COPY --from=tilt-helper /start.sh . diff --git a/docs/release/role-handbooks/release-lead/README.md b/docs/release/role-handbooks/release-lead/README.md index ad5902a3da9d..33d19095a407 100644 --- a/docs/release/role-handbooks/release-lead/README.md +++ b/docs/release/role-handbooks/release-lead/README.md @@ -174,7 +174,7 @@ The goal of this task is to ensure we are always using the latest Go version for 1. Keep track of new Go versions 2. Bump the Go version in supported branches if necessary -
Prior art: [Bump go to v1.23.7](https://github.com/kubernetes-sigs/cluster-api/pull/11981) +
Prior art: [Bump go to v1.24.7](https://github.com/kubernetes-sigs/cluster-api/pull/11981) Note: If the Go minor version of one of our supported branches goes out of support, we should consider bumping to a newer Go minor version according to our [backport policy](./../../../../CONTRIBUTING.md#backporting-a-patch). diff --git a/netlify.toml b/netlify.toml index 6bcc784a2ab2..f395dce1a2d0 100644 --- a/netlify.toml +++ b/netlify.toml @@ -4,7 +4,7 @@ publish = "docs/book/book" [build.environment] - GO_VERSION = "1.24.6" + GO_VERSION = "1.24.7" # Standard Netlify redirects [[redirects]] From 3a708eda40aea250a27e072a572dba0cc5180a0e Mon Sep 17 00:00:00 2001 From: pratik-mahalle Date: Fri, 5 Sep 2025 12:43:31 +0530 Subject: [PATCH 2/2] fix: revert the changes in the README Signed-off-by: pratik-mahalle --- docs/release/role-handbooks/release-lead/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/release/role-handbooks/release-lead/README.md b/docs/release/role-handbooks/release-lead/README.md index 33d19095a407..ad5902a3da9d 100644 --- a/docs/release/role-handbooks/release-lead/README.md +++ b/docs/release/role-handbooks/release-lead/README.md @@ -174,7 +174,7 @@ The goal of this task is to ensure we are always using the latest Go version for 1. Keep track of new Go versions 2. Bump the Go version in supported branches if necessary -
Prior art: [Bump go to v1.24.7](https://github.com/kubernetes-sigs/cluster-api/pull/11981) +
Prior art: [Bump go to v1.23.7](https://github.com/kubernetes-sigs/cluster-api/pull/11981) Note: If the Go minor version of one of our supported branches goes out of support, we should consider bumping to a newer Go minor version according to our [backport policy](./../../../../CONTRIBUTING.md#backporting-a-patch).