Skip to content

Commit b878bf9

Browse files
k8s-ci-robotk8s-ci-robot
authoredApr 2, 2025··
Merge pull request #4585 from dongjiang1989/update-go-1.24
✨ (CLI, go/v4): Upgrade Golang version to v1.24.0
2 parents 4fda76e + 1ca4470 commit b878bf9

File tree

33 files changed

+41
-39
lines changed

33 files changed

+41
-39
lines changed
 

‎.github/workflows/lint-sample.yml

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838
- name: Run linter
3939
uses: golangci/golangci-lint-action@v6
4040
with:
41+
install-mode: goinstall
4142
version: v1.63.4
4243
working-directory: ${{ matrix.folder }}
4344
args: --config .golangci.yml ./...

‎.github/workflows/lint.yml

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
- name: Run linter
2727
uses: golangci/golangci-lint-action@v6
2828
with:
29+
install-mode: goinstall
2930
version: v1.63.4
3031

3132
yamllint:

‎Makefile

+1-2
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,7 @@ yamllint:
124124
GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
125125
golangci-lint:
126126
@[ -f $(GOLANGCI_LINT) ] || { \
127-
set -e ;\
128-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell dirname $(GOLANGCI_LINT)) v1.63.4 ;\
127+
GOBIN=$(shell pwd)/bin go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.63.4 ;\
129128
}
130129

131130
.PHONY: apidiff

‎docs/book/src/cronjob-tutorial/testdata/project/.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Kubebuilder DevContainer",
3-
"image": "docker.io/golang:1.23",
3+
"image": "docker.io/golang:1.24",
44
"features": {
55
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
66
"ghcr.io/devcontainers/features/git:1": {}

‎docs/book/src/cronjob-tutorial/testdata/project/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM docker.io/golang:1.23 AS builder
2+
FROM docker.io/golang:1.24 AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55

‎docs/book/src/cronjob-tutorial/testdata/project/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
## Getting Started
88

99
### Prerequisites
10-
- go version v1.23.0+
10+
- go version v1.24.0+
1111
- docker version 17.03+.
1212
- kubectl version v1.11.3+.
1313
- Access to a Kubernetes v1.11.3+ cluster.

‎docs/book/src/cronjob-tutorial/testdata/project/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module tutorial.kubebuilder.io/project
22

3-
go 1.23.0
3+
go 1.24.0
44

5-
godebug default=go1.23
5+
godebug default=go1.24
66

77
require (
88
github.com/onsi/ginkgo/v2 v2.22.0

‎docs/book/src/getting-started/testdata/project/.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Kubebuilder DevContainer",
3-
"image": "docker.io/golang:1.23",
3+
"image": "docker.io/golang:1.24",
44
"features": {
55
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
66
"ghcr.io/devcontainers/features/git:1": {}

‎docs/book/src/getting-started/testdata/project/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM docker.io/golang:1.23 AS builder
2+
FROM docker.io/golang:1.24 AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55

‎docs/book/src/getting-started/testdata/project/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
## Getting Started
88

99
### Prerequisites
10-
- go version v1.23.0+
10+
- go version v1.24.0+
1111
- docker version 17.03+.
1212
- kubectl version v1.11.3+.
1313
- Access to a Kubernetes v1.11.3+ cluster.

‎docs/book/src/getting-started/testdata/project/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module example.com/memcached
22

3-
go 1.23.0
3+
go 1.24.0
44

5-
godebug default=go1.23
5+
godebug default=go1.24
66

77
require (
88
github.com/onsi/ginkgo/v2 v2.22.0

‎docs/book/src/multiversion-tutorial/testdata/project/.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Kubebuilder DevContainer",
3-
"image": "docker.io/golang:1.23",
3+
"image": "docker.io/golang:1.24",
44
"features": {
55
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
66
"ghcr.io/devcontainers/features/git:1": {}

‎docs/book/src/multiversion-tutorial/testdata/project/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM docker.io/golang:1.23 AS builder
2+
FROM docker.io/golang:1.24 AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55

‎docs/book/src/multiversion-tutorial/testdata/project/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
## Getting Started
88

99
### Prerequisites
10-
- go version v1.23.0+
10+
- go version v1.24.0+
1111
- docker version 17.03+.
1212
- kubectl version v1.11.3+.
1313
- Access to a Kubernetes v1.11.3+ cluster.

‎docs/book/src/multiversion-tutorial/testdata/project/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module tutorial.kubebuilder.io/project
22

3-
go 1.23.0
3+
go 1.24.0
44

5-
godebug default=go1.23
5+
godebug default=go1.24
66

77
require (
88
github.com/onsi/ginkgo/v2 v2.22.0

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module sigs.k8s.io/kubebuilder/v4
22

3-
go 1.23.0
3+
go 1.24.0
44

5-
godebug default=go1.23
5+
godebug default=go1.24
66

77
require (
88
github.com/gobuffalo/flect v1.0.3

‎pkg/plugins/golang/go_version_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ var _ = Describe("checkGoVersion", func() {
213213
Entry("for go.1.21", "go1.21"),
214214
Entry("for go.1.22", "go1.22"),
215215
Entry("for go.1.23", "go1.23"),
216+
Entry("for go.1.24", "go1.24"),
216217
)
217218

218219
DescribeTable("should return an error for non-supported go versions",

‎pkg/plugins/golang/v4/scaffolds/internal/templates/devcontainer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
const devContainerTemplate = `{
2424
"name": "Kubebuilder DevContainer",
25-
"image": "docker.io/golang:1.23",
25+
"image": "docker.io/golang:1.24",
2626
"features": {
2727
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
2828
"ghcr.io/devcontainers/features/git:1": {}

‎pkg/plugins/golang/v4/scaffolds/internal/templates/dockerfile.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func (f *Dockerfile) SetTemplateDefaults() error {
3939
}
4040

4141
const dockerfileTemplate = `# Build the manager binary
42-
FROM docker.io/golang:1.23 AS builder
42+
FROM docker.io/golang:1.24 AS builder
4343
ARG TARGETOS
4444
ARG TARGETARCH
4545

‎pkg/plugins/golang/v4/scaffolds/internal/templates/gomod.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ func (f *GoMod) SetTemplateDefaults() error {
4545

4646
const goModTemplate = `module {{ .Repo }}
4747
48-
go 1.23.0
48+
go 1.24.0
4949
50-
godebug default=go1.23
50+
godebug default=go1.24
5151
5252
require (
5353
sigs.k8s.io/controller-runtime {{ .ControllerRuntimeVersion }}

‎pkg/plugins/golang/v4/scaffolds/internal/templates/readme.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ const readmeFileTemplate = `# {{ .ProjectName }}
7373
## Getting Started
7474
7575
### Prerequisites
76-
- go version v1.23.0+
76+
- go version v1.24.0+
7777
- docker version 17.03+.
7878
- kubectl version v1.11.3+.
7979
- Access to a Kubernetes v1.11.3+ cluster.

‎testdata/project-v4-multigroup/.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Kubebuilder DevContainer",
3-
"image": "docker.io/golang:1.23",
3+
"image": "docker.io/golang:1.24",
44
"features": {
55
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
66
"ghcr.io/devcontainers/features/git:1": {}

‎testdata/project-v4-multigroup/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM docker.io/golang:1.23 AS builder
2+
FROM docker.io/golang:1.24 AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55

‎testdata/project-v4-multigroup/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
## Getting Started
88

99
### Prerequisites
10-
- go version v1.23.0+
10+
- go version v1.24.0+
1111
- docker version 17.03+.
1212
- kubectl version v1.11.3+.
1313
- Access to a Kubernetes v1.11.3+ cluster.

‎testdata/project-v4-multigroup/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup
22

3-
go 1.23.0
3+
go 1.24.0
44

5-
godebug default=go1.23
5+
godebug default=go1.24
66

77
require (
88
github.com/cert-manager/cert-manager v1.17.1

‎testdata/project-v4-with-plugins/.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Kubebuilder DevContainer",
3-
"image": "docker.io/golang:1.23",
3+
"image": "docker.io/golang:1.24",
44
"features": {
55
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
66
"ghcr.io/devcontainers/features/git:1": {}

‎testdata/project-v4-with-plugins/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM docker.io/golang:1.23 AS builder
2+
FROM docker.io/golang:1.24 AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55

‎testdata/project-v4-with-plugins/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
## Getting Started
88

99
### Prerequisites
10-
- go version v1.23.0+
10+
- go version v1.24.0+
1111
- docker version 17.03+.
1212
- kubectl version v1.11.3+.
1313
- Access to a Kubernetes v1.11.3+ cluster.

‎testdata/project-v4-with-plugins/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module sigs.k8s.io/kubebuilder/testdata/project-v4-with-plugins
22

3-
go 1.23.0
3+
go 1.24.0
44

5-
godebug default=go1.23
5+
godebug default=go1.24
66

77
require (
88
github.com/onsi/ginkgo/v2 v2.22.0

‎testdata/project-v4/.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Kubebuilder DevContainer",
3-
"image": "docker.io/golang:1.23",
3+
"image": "docker.io/golang:1.24",
44
"features": {
55
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
66
"ghcr.io/devcontainers/features/git:1": {}

‎testdata/project-v4/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM docker.io/golang:1.23 AS builder
2+
FROM docker.io/golang:1.24 AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55

‎testdata/project-v4/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
## Getting Started
88

99
### Prerequisites
10-
- go version v1.23.0+
10+
- go version v1.24.0+
1111
- docker version 17.03+.
1212
- kubectl version v1.11.3+.
1313
- Access to a Kubernetes v1.11.3+ cluster.

‎testdata/project-v4/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module sigs.k8s.io/kubebuilder/testdata/project-v4
22

3-
go 1.23.0
3+
go 1.24.0
44

5-
godebug default=go1.23
5+
godebug default=go1.24
66

77
require (
88
github.com/cert-manager/cert-manager v1.17.1

0 commit comments

Comments
 (0)
Please sign in to comment.