Skip to content

Commit 47c4e4f

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #850 from furkatgofurov7/bump-go-1-24
🌱 Bump Golang to 1.24 minor version
2 parents e3402e8 + ffb5571 commit 47c4e4f

File tree

11 files changed

+72
-78
lines changed

11 files changed

+72
-78
lines changed

‎.github/workflows/pr-dependabot.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # tag=v5.0.0
2828
with:
2929
# go-version: ${{ steps.vars.outputs.go_version }} // TODO: we have to use go version consistent with test infra jobs
30-
go-version: '1.23'
30+
go-version: '1.24'
3131
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # tag=v4.2.3
3232
name: Restore go cache
3333
with:

‎.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Set up Go
2323
uses: actions/setup-go@v5
2424
with:
25-
go-version: '1.23'
25+
go-version: '1.24'
2626
- name: Run GoReleaser
2727
uses: goreleaser/goreleaser-action@v6
2828
with:

‎.golangci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: "2"
22
run:
3-
go: "1.23"
3+
go: "1.24"
44
allow-parallel-runners: true
55
linters:
66
default: none

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ROOT:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
2323

2424
.DEFAULT_GOAL:=help
2525

26-
GO_VERSION ?= 1.23.0
26+
GO_VERSION ?= 1.24.4
2727
GO_BASE_CONTAINER ?= docker.io/library/golang
2828
GO_CONTAINER_IMAGE = $(GO_BASE_CONTAINER):$(GO_VERSION)
2929

@@ -111,7 +111,7 @@ ENVSUBST_VER := v2.0.0-20210730161058-179042472c46
111111
ENVSUBST_BIN := envsubst
112112
ENVSUBST := $(TOOLS_BIN_DIR)/$(ENVSUBST_BIN)-$(ENVSUBST_VER)
113113

114-
GO_APIDIFF_VER := v0.8.2
114+
GO_APIDIFF_VER := v0.8.3
115115
GO_APIDIFF_BIN := go-apidiff
116116
GO_APIDIFF := $(TOOLS_BIN_DIR)/$(GO_APIDIFF_BIN)-$(GO_APIDIFF_VER)
117117

‎go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module sigs.k8s.io/cluster-api-operator
22

3-
go 1.23.0
4-
5-
toolchain go1.23.6
3+
go 1.24.4
64

75
require (
86
github.com/MakeNowJust/heredoc v1.0.0

‎hack/chart-update/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module sigs.k8s.io/cluster-api-operator/hack/chart-update
22

3-
go 1.24.0
3+
go 1.24.4
44

55
require (
66
github.com/google/go-github/v50 v50.2.0

‎hack/ensure-go.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ EOF
3131
local go_version
3232
IFS=" " read -ra go_version <<< "$(go version)"
3333
local minimum_go_version
34-
minimum_go_version=go1.23.0
34+
minimum_go_version=go1.24.0
3535
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
3636
cat <<EOF
3737
Detected go version: ${go_version[*]}.

‎hack/tools/go.mod

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module sigs.k8s.io/cluster-api-operator/hack/tools
22

3-
go 1.23.0
4-
5-
toolchain go1.23.7
3+
go 1.24.4
64

75
replace (
86
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.0-beta.0
@@ -11,7 +9,7 @@ replace (
119

1210
require (
1311
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46
14-
github.com/joelanford/go-apidiff v0.8.2
12+
github.com/joelanford/go-apidiff v0.8.3
1513
github.com/onsi/ginkgo/v2 v2.23.0
1614
gotest.tools/gotestsum v1.11.0
1715
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240116064735-bfe8d0d16ff3
@@ -20,27 +18,27 @@ require (
2018
)
2119

2220
require (
23-
dario.cat/mergo v1.0.1 // indirect
24-
github.com/Microsoft/go-winio v0.6.1 // indirect
25-
github.com/ProtonMail/go-crypto v1.1.3 // indirect
21+
dario.cat/mergo v1.0.2 // indirect
22+
github.com/Microsoft/go-winio v0.6.2 // indirect
23+
github.com/ProtonMail/go-crypto v1.2.0 // indirect
2624
github.com/bitfield/gotestdox v0.2.1 // indirect
2725
github.com/blang/semver/v4 v4.0.0 // indirect
2826
github.com/cloudflare/circl v1.6.1 // indirect
29-
github.com/cyphar/filepath-securejoin v0.2.5 // indirect
27+
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
3028
github.com/dnephin/pflag v1.0.7 // indirect
3129
github.com/emirpasic/gods v1.18.1 // indirect
3230
github.com/fatih/color v1.18.0 // indirect
3331
github.com/fsnotify/fsnotify v1.8.0 // indirect
3432
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
3533
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
36-
github.com/go-git/go-billy/v5 v5.6.0 // indirect
37-
github.com/go-git/go-git/v5 v5.13.0 // indirect
34+
github.com/go-git/go-billy/v5 v5.6.2 // indirect
35+
github.com/go-git/go-git/v5 v5.16.0 // indirect
3836
github.com/go-logr/logr v1.4.2 // indirect
3937
github.com/go-logr/zapr v1.3.0 // indirect
4038
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4139
github.com/gobuffalo/flect v1.0.3 // indirect
4240
github.com/gogo/protobuf v1.3.2 // indirect
43-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
41+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
4442
github.com/google/gofuzz v1.2.0 // indirect
4543
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
4644
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
@@ -52,26 +50,26 @@ require (
5250
github.com/mattn/go-isatty v0.0.20 // indirect
5351
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5452
github.com/modern-go/reflect2 v1.0.2 // indirect
55-
github.com/pjbgf/sha1cd v0.3.0 // indirect
53+
github.com/pjbgf/sha1cd v0.3.2 // indirect
5654
github.com/pkg/errors v0.9.1 // indirect
5755
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
58-
github.com/skeema/knownhosts v1.3.0 // indirect
56+
github.com/skeema/knownhosts v1.3.1 // indirect
5957
github.com/spf13/afero v1.12.0 // indirect
6058
github.com/spf13/cobra v1.9.1 // indirect
6159
github.com/spf13/pflag v1.0.6 // indirect
6260
github.com/x448/float16 v0.8.4 // indirect
6361
github.com/xanzy/ssh-agent v0.3.3 // indirect
6462
go.uber.org/multierr v1.11.0 // indirect
6563
go.uber.org/zap v1.27.0 // indirect
66-
golang.org/x/crypto v0.36.0 // indirect
67-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
68-
golang.org/x/mod v0.23.0 // indirect
69-
golang.org/x/net v0.38.0 // indirect
70-
golang.org/x/sync v0.12.0 // indirect
71-
golang.org/x/sys v0.31.0 // indirect
72-
golang.org/x/term v0.30.0 // indirect
73-
golang.org/x/text v0.23.0 // indirect
74-
golang.org/x/tools v0.30.0 // indirect
64+
golang.org/x/crypto v0.38.0 // indirect
65+
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect
66+
golang.org/x/mod v0.24.0 // indirect
67+
golang.org/x/net v0.40.0 // indirect
68+
golang.org/x/sync v0.14.0 // indirect
69+
golang.org/x/sys v0.33.0 // indirect
70+
golang.org/x/term v0.32.0 // indirect
71+
golang.org/x/text v0.25.0 // indirect
72+
golang.org/x/tools v0.33.0 // indirect
7573
gopkg.in/inf.v0 v0.9.1 // indirect
7674
gopkg.in/warnings.v0 v0.1.2 // indirect
7775
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)