Skip to content

Commit c02551b

Browse files
authored
Merge pull request kubernetes-sigs#5652 from bryan-cox/bump-golang
🌱 Upgrade Go version to 1.24
2 parents 4532d16 + bf170ad commit c02551b

File tree

7 files changed

+8
-7
lines changed

7 files changed

+8
-7
lines changed

.github/workflows/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Set up Go 1.x
2626
uses: actions/setup-go@v5
2727
with:
28-
go-version: '1.23'
28+
go-version: '1.24'
2929
id: go
3030
- name: Check out code into the Go module directory
3131
uses: actions/checkout@v5

.golangci-kal.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "2"
22

33
run:
44
timeout: 10m
5-
go: "1.22"
5+
go: "1.24"
66
allow-parallel-runners: true
77

88
linters:

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ include $(ROOT_DIR_RELATIVE)/common.mk
2020
# https://suva.sh/posts/well-documented-makefiles
2121

2222
# Go
23-
GO_VERSION ?=1.23.9
23+
GO_VERSION ?=1.24.7
2424
GO_CONTAINER_IMAGE ?= golang:$(GO_VERSION)
2525

2626
# Directories.

cloudbuild-nightly.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ timeout: 3000s
33
options:
44
substitution_option: ALLOW_LOOSE
55
steps:
6-
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud@sha256:4e830b673791d5595719bc6c4ca62dce3746b4e20d749e45004254bc6ef0a140' # v20250116-2a05ea7e3d go 1.23.4
6+
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud@sha256:63840f133e0dfeea0af9ef391210da7fab9d2676172e2967fccab0cd6110c4e7' # v20250513-9264efb079 go 1.24.3
77
entrypoint: make
88
env:
99
- DOCKER_CLI_EXPERIMENTAL=enabled

cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ timeout: 3000s
33
options:
44
substitution_option: ALLOW_LOOSE
55
steps:
6-
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud@sha256:4e830b673791d5595719bc6c4ca62dce3746b4e20d749e45004254bc6ef0a140' # v20250116-2a05ea7e3d go 1.23.4
6+
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud@sha256:63840f133e0dfeea0af9ef391210da7fab9d2676172e2967fccab0cd6110c4e7' # v20250513-9264efb079 go 1.24.3
77
entrypoint: make
88
env:
99
- DOCKER_CLI_EXPERIMENTAL=enabled

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-provider-aws/v2
22

3-
go 1.23.1
3+
go 1.24.0
44

55
require (
66
github.com/alessio/shellescape v1.4.2

hack/tools/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ ifeq ($(OS), windows)
4545
MDBOOK_EXTRACT_COMMAND := unzip -d /tmp
4646
endif
4747

48-
GOLANGCI_LINT_VERSION := v1.55.2
48+
# Use a golangci-lint built with Go >= 1.24 to match repo go.mod
49+
GOLANGCI_LINT_VERSION := v1.60.3
4950
## --------------------------------------
5051
## Tooling Binaries
5152
## --------------------------------------

0 commit comments

Comments
 (0)