Merge pull request #13164 from sivchari/bump-go1.25.5

k8s-ci-robot · web-flow · commit ff486711ec93 · 2025-12-18T05:39:17.000-08:00
✨ Bump Go to v1.25.5
diff --git a/.github/workflows/pr-golangci-lint.yaml b/.github/workflows/pr-golangci-lint.yaml
@@ -11,10 +11,6 @@ jobs:
   golangci:
     name: lint
     runs-on: ubuntu-latest
-    env:
-      # Required with Go 1.24 to enable usage of synctest in unit tests
-      # Can be removed after we bumped to Go 1.25.
-      GOEXPERIMENT: synctest
     strategy:
       fail-fast: false
       matrix:
diff --git a/.golangci-kal.yml b/.golangci-kal.yml
@@ -1,6 +1,6 @@
 version: "2"
 run:
-  go: "1.24"
+  go: "1.25"
   allow-parallel-runners: true
 linters:
   default: none
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,7 +1,7 @@
 version: "2"
 run:
   timeout: 10m
-  go: "1.24"
+  go: "1.25"
   build-tags:
     - tools
     - e2e
diff --git a/Makefile b/Makefile
@@ -23,18 +23,14 @@ SHELL:=/usr/bin/env bash
 #
 # Go.
 #
-GO_VERSION ?= 1.24.11
-GO_DIRECTIVE_VERSION ?= 1.24.0
+GO_VERSION ?= 1.25.5
+GO_DIRECTIVE_VERSION ?= 1.25.0
 GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)
 
 # Ensure correct toolchain is used
 GOTOOLCHAIN = go$(GO_VERSION)
 export GOTOOLCHAIN
 
-# Required with Go 1.24 to enable usage of synctest in unit tests
-# Can be removed after we bumped to Go 1.25.
-export GOEXPERIMENT=synctest
-
 # Use GOPROXY environment variable if set
 GOPROXY := $(shell go env GOPROXY)
 ifeq ($(GOPROXY),)
@@ -195,7 +191,7 @@ TRIAGE_PARTY_VERSION ?= v1.6.0
 CONVERSION_VERIFIER_BIN := conversion-verifier
 CONVERSION_VERIFIER := $(abspath $(TOOLS_BIN_DIR)/$(CONVERSION_VERIFIER_BIN))
 
-OPENAPI_GEN_VER := 2c72e55 # main branch as of 03.01.2025
+OPENAPI_GEN_VER := 4e65d59 # main branch as of 12.18.2025
 OPENAPI_GEN_BIN := openapi-gen
 # We are intentionally using the binary without version suffix, to avoid the version
 # in generated files.
diff --git a/Tiltfile b/Tiltfile
@@ -172,9 +172,9 @@ def load_provider_tilt_files():
 
 tilt_helper_dockerfile_header = """
 # Tilt image
-FROM golang:1.24.11 as tilt-helper
+FROM golang:1.25.5 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
+RUN go install github.com/go-delve/delve/cmd/dlv@v1.25
 # Support live reloading with Tilt
 RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/tilt-dev/rerun-process-wrapper/master/restart.sh  && \
     wget --output-document /start.sh --quiet https://raw.githubusercontent.com/tilt-dev/rerun-process-wrapper/master/start.sh && \
@@ -183,7 +183,7 @@ RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com
 """
 
 tilt_dockerfile_header = """
-FROM golang:1.24.11 as tilt
+FROM golang:1.25.5 as tilt
 WORKDIR /
 COPY --from=tilt-helper /process.txt .
 COPY --from=tilt-helper /start.sh .
diff --git a/cloudbuild-nightly.yaml b/cloudbuild-nightly.yaml
@@ -5,7 +5,7 @@ options:
   substitution_option: ALLOW_LOOSE
   machineType: 'E2_HIGHCPU_8'
 steps:
-  - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud@sha256:63840f133e0dfeea0af9ef391210da7fab9d2676172e2967fccab0cd6110c4e7' # v20250513-9264efb079
+  - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud@sha256:8d6a3a5b895e6776dbe9115b75db1412fbe57299b8db329d45cb54680e462b0b' # v20251211-4c812d4cd8
     entrypoint: make
     env:
     - DOCKER_CLI_EXPERIMENTAL=enabled
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -5,7 +5,7 @@ options:
   substitution_option: ALLOW_LOOSE
   machineType: 'E2_HIGHCPU_8'
 steps:
-  - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud@sha256:63840f133e0dfeea0af9ef391210da7fab9d2676172e2967fccab0cd6110c4e7' # v20250513-9264efb079
+  - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud@sha256:8d6a3a5b895e6776dbe9115b75db1412fbe57299b8db329d45cb54680e462b0b' # v20251211-4c812d4cd8
     entrypoint: make
     env:
     - DOCKER_CLI_EXPERIMENTAL=enabled
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/cluster-api
 
-go 1.24.0
+go 1.25.0
 
 require (
 	github.com/MakeNowJust/heredoc v1.0.0
diff --git a/hack/ensure-go.sh b/hack/ensure-go.sh
@@ -38,7 +38,7 @@ EOF
   local go_version
   IFS=" " read -ra go_version <<< "$(go version)"
   local minimum_go_version
-  minimum_go_version=go1.24
+  minimum_go_version=go1.25
   if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then
     cat <<EOF
 Detected go version: ${go_version[*]}.
diff --git a/hack/tools/go.mod b/hack/tools/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/cluster-api/hack/tools
 
-go 1.24.0
+go 1.25.0
 
 replace sigs.k8s.io/cluster-api => ../../
 
diff --git a/internal/util/controller/controller_test.go b/internal/util/controller/controller_test.go
@@ -46,7 +46,7 @@ func TestReconcile(t *testing.T) {
 
 	// Using synctest with Go 1.24 requires setting the GOEXPERIMENT env var to synctest.
 	// In Intellij this can be done via Settings > Language & Frameworks > Go > Build Tags > Experiments
-	synctest.Run(func() {
+	synctest.Test(t, func(t *testing.T) {
 		g := NewWithT(t)
 
 		var reconcileCounter int
@@ -146,7 +146,7 @@ func TestReconcileMetrics(t *testing.T) {
 
 	// Using synctest with Go 1.24 requires setting the GOEXPERIMENT env var to synctest.
 	// In Intellij this can be done via Settings > Language & Frameworks > Go > Build Tags > Experiments
-	synctest.Run(func() {
+	synctest.Test(t, func(t *testing.T) {
 		g := NewWithT(t)
 
 		r := reconcilerWrapper{
diff --git a/netlify.toml b/netlify.toml
@@ -4,7 +4,7 @@
     publish = "docs/book/book"
 
 [build.environment]
-    GO_VERSION = "1.24.11"
+    GO_VERSION = "1.25.5"
 
 # Standard Netlify redirects
 [[redirects]]
diff --git a/test/go.mod b/test/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/cluster-api/test
 
-go 1.24.0
+go 1.25.0
 
 replace sigs.k8s.io/cluster-api => ../
 
