From 3cbeee934a608720a96ba1b0c15fd2734f84bc45 Mon Sep 17 00:00:00 2001 From: Camila Macedo <7708031+camilamacedo86@users.noreply.github.com> Date: Sun, 9 Nov 2025 20:15:35 +0000 Subject: [PATCH] (chore): Upgrade to Go to 1.24.6 and standardize version across codebase --- .../testdata/project/.devcontainer/devcontainer.json | 2 +- docs/book/src/cronjob-tutorial/testdata/project/Dockerfile | 2 +- docs/book/src/cronjob-tutorial/testdata/project/README.md | 2 +- docs/book/src/cronjob-tutorial/testdata/project/go.mod | 2 +- .../testdata/project/.devcontainer/devcontainer.json | 2 +- docs/book/src/getting-started/testdata/project/Dockerfile | 2 +- docs/book/src/getting-started/testdata/project/README.md | 2 +- docs/book/src/getting-started/testdata/project/go.mod | 2 +- .../testdata/project/.devcontainer/devcontainer.json | 2 +- docs/book/src/multiversion-tutorial/testdata/project/Dockerfile | 2 +- docs/book/src/multiversion-tutorial/testdata/project/README.md | 2 +- docs/book/src/multiversion-tutorial/testdata/project/go.mod | 2 +- docs/book/src/quick-start.md | 2 +- .../testdata/sampleexternalplugin/v1/go.mod | 2 +- go.mod | 2 +- .../golang/v4/scaffolds/internal/templates/devcontainer.go | 2 +- .../golang/v4/scaffolds/internal/templates/dockerfile.go | 2 +- pkg/plugins/golang/v4/scaffolds/internal/templates/gomod.go | 2 +- pkg/plugins/golang/v4/scaffolds/internal/templates/readme.go | 2 +- testdata/project-v4-multigroup/.devcontainer/devcontainer.json | 2 +- testdata/project-v4-multigroup/Dockerfile | 2 +- testdata/project-v4-multigroup/README.md | 2 +- testdata/project-v4-multigroup/go.mod | 2 +- .../project-v4-with-plugins/.devcontainer/devcontainer.json | 2 +- testdata/project-v4-with-plugins/Dockerfile | 2 +- testdata/project-v4-with-plugins/README.md | 2 +- testdata/project-v4-with-plugins/go.mod | 2 +- testdata/project-v4/.devcontainer/devcontainer.json | 2 +- testdata/project-v4/Dockerfile | 2 +- testdata/project-v4/README.md | 2 +- testdata/project-v4/go.mod | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/docs/book/src/cronjob-tutorial/testdata/project/.devcontainer/devcontainer.json b/docs/book/src/cronjob-tutorial/testdata/project/.devcontainer/devcontainer.json index 7665a1235d0..a3ab7541cb6 100644 --- a/docs/book/src/cronjob-tutorial/testdata/project/.devcontainer/devcontainer.json +++ b/docs/book/src/cronjob-tutorial/testdata/project/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Kubebuilder DevContainer", - "image": "golang:1.25", + "image": "golang:1.24", "features": { "ghcr.io/devcontainers/features/docker-in-docker:2": {}, "ghcr.io/devcontainers/features/git:1": {} diff --git a/docs/book/src/cronjob-tutorial/testdata/project/Dockerfile b/docs/book/src/cronjob-tutorial/testdata/project/Dockerfile index a022882c892..6466c484903 100644 --- a/docs/book/src/cronjob-tutorial/testdata/project/Dockerfile +++ b/docs/book/src/cronjob-tutorial/testdata/project/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.25 AS builder +FROM golang:1.24 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/docs/book/src/cronjob-tutorial/testdata/project/README.md b/docs/book/src/cronjob-tutorial/testdata/project/README.md index 1f97b7906a3..fcc53b94123 100644 --- a/docs/book/src/cronjob-tutorial/testdata/project/README.md +++ b/docs/book/src/cronjob-tutorial/testdata/project/README.md @@ -7,7 +7,7 @@ ## Getting Started ### Prerequisites -- go version v1.24.0+ +- go version v1.24.6+ - docker version 17.03+. - kubectl version v1.11.3+. - Access to a Kubernetes v1.11.3+ cluster. diff --git a/docs/book/src/cronjob-tutorial/testdata/project/go.mod b/docs/book/src/cronjob-tutorial/testdata/project/go.mod index b832e6bd35a..a3a13944085 100644 --- a/docs/book/src/cronjob-tutorial/testdata/project/go.mod +++ b/docs/book/src/cronjob-tutorial/testdata/project/go.mod @@ -1,6 +1,6 @@ module tutorial.kubebuilder.io/project -go 1.24.5 +go 1.24.6 require ( github.com/onsi/ginkgo/v2 v2.22.0 diff --git a/docs/book/src/getting-started/testdata/project/.devcontainer/devcontainer.json b/docs/book/src/getting-started/testdata/project/.devcontainer/devcontainer.json index 7665a1235d0..a3ab7541cb6 100644 --- a/docs/book/src/getting-started/testdata/project/.devcontainer/devcontainer.json +++ b/docs/book/src/getting-started/testdata/project/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Kubebuilder DevContainer", - "image": "golang:1.25", + "image": "golang:1.24", "features": { "ghcr.io/devcontainers/features/docker-in-docker:2": {}, "ghcr.io/devcontainers/features/git:1": {} diff --git a/docs/book/src/getting-started/testdata/project/Dockerfile b/docs/book/src/getting-started/testdata/project/Dockerfile index a022882c892..6466c484903 100644 --- a/docs/book/src/getting-started/testdata/project/Dockerfile +++ b/docs/book/src/getting-started/testdata/project/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.25 AS builder +FROM golang:1.24 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/docs/book/src/getting-started/testdata/project/README.md b/docs/book/src/getting-started/testdata/project/README.md index 1f97b7906a3..fcc53b94123 100644 --- a/docs/book/src/getting-started/testdata/project/README.md +++ b/docs/book/src/getting-started/testdata/project/README.md @@ -7,7 +7,7 @@ ## Getting Started ### Prerequisites -- go version v1.24.0+ +- go version v1.24.6+ - docker version 17.03+. - kubectl version v1.11.3+. - Access to a Kubernetes v1.11.3+ cluster. diff --git a/docs/book/src/getting-started/testdata/project/go.mod b/docs/book/src/getting-started/testdata/project/go.mod index f35f1e6438a..982eaea4a31 100644 --- a/docs/book/src/getting-started/testdata/project/go.mod +++ b/docs/book/src/getting-started/testdata/project/go.mod @@ -1,6 +1,6 @@ module example.com/memcached -go 1.24.5 +go 1.24.6 require ( github.com/onsi/ginkgo/v2 v2.22.0 diff --git a/docs/book/src/multiversion-tutorial/testdata/project/.devcontainer/devcontainer.json b/docs/book/src/multiversion-tutorial/testdata/project/.devcontainer/devcontainer.json index 7665a1235d0..a3ab7541cb6 100644 --- a/docs/book/src/multiversion-tutorial/testdata/project/.devcontainer/devcontainer.json +++ b/docs/book/src/multiversion-tutorial/testdata/project/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Kubebuilder DevContainer", - "image": "golang:1.25", + "image": "golang:1.24", "features": { "ghcr.io/devcontainers/features/docker-in-docker:2": {}, "ghcr.io/devcontainers/features/git:1": {} diff --git a/docs/book/src/multiversion-tutorial/testdata/project/Dockerfile b/docs/book/src/multiversion-tutorial/testdata/project/Dockerfile index a022882c892..6466c484903 100644 --- a/docs/book/src/multiversion-tutorial/testdata/project/Dockerfile +++ b/docs/book/src/multiversion-tutorial/testdata/project/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.25 AS builder +FROM golang:1.24 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/docs/book/src/multiversion-tutorial/testdata/project/README.md b/docs/book/src/multiversion-tutorial/testdata/project/README.md index 1f97b7906a3..fcc53b94123 100644 --- a/docs/book/src/multiversion-tutorial/testdata/project/README.md +++ b/docs/book/src/multiversion-tutorial/testdata/project/README.md @@ -7,7 +7,7 @@ ## Getting Started ### Prerequisites -- go version v1.24.0+ +- go version v1.24.6+ - docker version 17.03+. - kubectl version v1.11.3+. - Access to a Kubernetes v1.11.3+ cluster. diff --git a/docs/book/src/multiversion-tutorial/testdata/project/go.mod b/docs/book/src/multiversion-tutorial/testdata/project/go.mod index 159cd3f53f3..d4178d4c180 100644 --- a/docs/book/src/multiversion-tutorial/testdata/project/go.mod +++ b/docs/book/src/multiversion-tutorial/testdata/project/go.mod @@ -1,6 +1,6 @@ module tutorial.kubebuilder.io/project -go 1.24.5 +go 1.24.6 require ( github.com/onsi/ginkgo/v2 v2.22.0 diff --git a/docs/book/src/quick-start.md b/docs/book/src/quick-start.md index 292647c90ff..93d3a176586 100644 --- a/docs/book/src/quick-start.md +++ b/docs/book/src/quick-start.md @@ -9,7 +9,7 @@ This Quick Start guide will cover: ## Prerequisites -- [go](https://go.dev/dl/) version v1.24.5+ +- [go](https://go.dev/dl/) version v1.24.6+ - [docker](https://docs.docker.com/install/) version 17.03+. - [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) version v1.11.3+. - Access to a Kubernetes v1.11.3+ cluster. diff --git a/docs/book/src/simple-external-plugin-tutorial/testdata/sampleexternalplugin/v1/go.mod b/docs/book/src/simple-external-plugin-tutorial/testdata/sampleexternalplugin/v1/go.mod index f95b27dc6bd..d790c2162b3 100644 --- a/docs/book/src/simple-external-plugin-tutorial/testdata/sampleexternalplugin/v1/go.mod +++ b/docs/book/src/simple-external-plugin-tutorial/testdata/sampleexternalplugin/v1/go.mod @@ -1,6 +1,6 @@ module v1 -go 1.24.5 +go 1.24.6 require ( github.com/spf13/pflag v1.0.10 diff --git a/go.mod b/go.mod index a04fb0e7b2e..f8089c55406 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kubebuilder/v4 -go 1.25.0 +go 1.24.6 require ( github.com/gobuffalo/flect v1.0.3 diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/devcontainer.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/devcontainer.go index 2a22df963a0..e49290c0183 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/devcontainer.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/devcontainer.go @@ -22,7 +22,7 @@ import ( const devContainerTemplate = `{ "name": "Kubebuilder DevContainer", - "image": "golang:1.25", + "image": "golang:1.24", "features": { "ghcr.io/devcontainers/features/docker-in-docker:2": {}, "ghcr.io/devcontainers/features/git:1": {} diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/dockerfile.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/dockerfile.go index 0c8f64c0978..8f74ae3975c 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/dockerfile.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/dockerfile.go @@ -39,7 +39,7 @@ func (f *Dockerfile) SetTemplateDefaults() error { } const dockerfileTemplate = `# Build the manager binary -FROM golang:1.25 AS builder +FROM golang:1.24 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/gomod.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/gomod.go index 2485580f3b3..e37832e3719 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/gomod.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/gomod.go @@ -45,7 +45,7 @@ func (f *GoMod) SetTemplateDefaults() error { const goModTemplate = `module {{ .Repo }} -go 1.24.5 +go 1.24.6 require ( sigs.k8s.io/controller-runtime {{ .ControllerRuntimeVersion }} diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/readme.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/readme.go index 5511c9be69a..14418ce5494 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/readme.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/readme.go @@ -73,7 +73,7 @@ const readmeFileTemplate = `# {{ .ProjectName }} ## Getting Started ### Prerequisites -- go version v1.24.0+ +- go version v1.24.6+ - docker version 17.03+. - kubectl version v1.11.3+. - Access to a Kubernetes v1.11.3+ cluster. diff --git a/testdata/project-v4-multigroup/.devcontainer/devcontainer.json b/testdata/project-v4-multigroup/.devcontainer/devcontainer.json index 7665a1235d0..a3ab7541cb6 100644 --- a/testdata/project-v4-multigroup/.devcontainer/devcontainer.json +++ b/testdata/project-v4-multigroup/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Kubebuilder DevContainer", - "image": "golang:1.25", + "image": "golang:1.24", "features": { "ghcr.io/devcontainers/features/docker-in-docker:2": {}, "ghcr.io/devcontainers/features/git:1": {} diff --git a/testdata/project-v4-multigroup/Dockerfile b/testdata/project-v4-multigroup/Dockerfile index a022882c892..6466c484903 100644 --- a/testdata/project-v4-multigroup/Dockerfile +++ b/testdata/project-v4-multigroup/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.25 AS builder +FROM golang:1.24 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/testdata/project-v4-multigroup/README.md b/testdata/project-v4-multigroup/README.md index 6346b081834..994ea4eba65 100644 --- a/testdata/project-v4-multigroup/README.md +++ b/testdata/project-v4-multigroup/README.md @@ -7,7 +7,7 @@ ## Getting Started ### Prerequisites -- go version v1.24.0+ +- go version v1.24.6+ - docker version 17.03+. - kubectl version v1.11.3+. - Access to a Kubernetes v1.11.3+ cluster. diff --git a/testdata/project-v4-multigroup/go.mod b/testdata/project-v4-multigroup/go.mod index 60038b0a015..e5a7c04a8a0 100644 --- a/testdata/project-v4-multigroup/go.mod +++ b/testdata/project-v4-multigroup/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup -go 1.24.5 +go 1.24.6 require ( github.com/cert-manager/cert-manager v1.18.2 diff --git a/testdata/project-v4-with-plugins/.devcontainer/devcontainer.json b/testdata/project-v4-with-plugins/.devcontainer/devcontainer.json index 7665a1235d0..a3ab7541cb6 100644 --- a/testdata/project-v4-with-plugins/.devcontainer/devcontainer.json +++ b/testdata/project-v4-with-plugins/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Kubebuilder DevContainer", - "image": "golang:1.25", + "image": "golang:1.24", "features": { "ghcr.io/devcontainers/features/docker-in-docker:2": {}, "ghcr.io/devcontainers/features/git:1": {} diff --git a/testdata/project-v4-with-plugins/Dockerfile b/testdata/project-v4-with-plugins/Dockerfile index a022882c892..6466c484903 100644 --- a/testdata/project-v4-with-plugins/Dockerfile +++ b/testdata/project-v4-with-plugins/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.25 AS builder +FROM golang:1.24 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/testdata/project-v4-with-plugins/README.md b/testdata/project-v4-with-plugins/README.md index c8b5eefa8b6..2a11bea79d5 100644 --- a/testdata/project-v4-with-plugins/README.md +++ b/testdata/project-v4-with-plugins/README.md @@ -7,7 +7,7 @@ ## Getting Started ### Prerequisites -- go version v1.24.0+ +- go version v1.24.6+ - docker version 17.03+. - kubectl version v1.11.3+. - Access to a Kubernetes v1.11.3+ cluster. diff --git a/testdata/project-v4-with-plugins/go.mod b/testdata/project-v4-with-plugins/go.mod index 5dfc266a51a..65e8bb2f7c6 100644 --- a/testdata/project-v4-with-plugins/go.mod +++ b/testdata/project-v4-with-plugins/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kubebuilder/testdata/project-v4-with-plugins -go 1.24.5 +go 1.24.6 require ( github.com/onsi/ginkgo/v2 v2.22.0 diff --git a/testdata/project-v4/.devcontainer/devcontainer.json b/testdata/project-v4/.devcontainer/devcontainer.json index 7665a1235d0..a3ab7541cb6 100644 --- a/testdata/project-v4/.devcontainer/devcontainer.json +++ b/testdata/project-v4/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Kubebuilder DevContainer", - "image": "golang:1.25", + "image": "golang:1.24", "features": { "ghcr.io/devcontainers/features/docker-in-docker:2": {}, "ghcr.io/devcontainers/features/git:1": {} diff --git a/testdata/project-v4/Dockerfile b/testdata/project-v4/Dockerfile index a022882c892..6466c484903 100644 --- a/testdata/project-v4/Dockerfile +++ b/testdata/project-v4/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.25 AS builder +FROM golang:1.24 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/testdata/project-v4/README.md b/testdata/project-v4/README.md index f90221a159f..b173350e4df 100644 --- a/testdata/project-v4/README.md +++ b/testdata/project-v4/README.md @@ -7,7 +7,7 @@ ## Getting Started ### Prerequisites -- go version v1.24.0+ +- go version v1.24.6+ - docker version 17.03+. - kubectl version v1.11.3+. - Access to a Kubernetes v1.11.3+ cluster. diff --git a/testdata/project-v4/go.mod b/testdata/project-v4/go.mod index a37ae6599d3..a1d01dbd128 100644 --- a/testdata/project-v4/go.mod +++ b/testdata/project-v4/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kubebuilder/testdata/project-v4 -go 1.24.5 +go 1.24.6 require ( github.com/cert-manager/cert-manager v1.18.2