diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml index eb532e3554..9dffa79764 100644 --- a/.github/workflows/dependabot.yml +++ b/.github/workflows/dependabot.yml @@ -25,7 +25,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v5 with: - go-version: '1.23' + go-version: '1.24' id: go - name: Check out code into the Go module directory uses: actions/checkout@v5 diff --git a/.golangci-kal.yml b/.golangci-kal.yml index 9a7d650a1b..ab8ed03edf 100644 --- a/.golangci-kal.yml +++ b/.golangci-kal.yml @@ -2,7 +2,7 @@ version: "2" run: timeout: 10m - go: "1.22" + go: "1.24" allow-parallel-runners: true linters: diff --git a/Makefile b/Makefile index fdff00b7dd..b820793ba8 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ include $(ROOT_DIR_RELATIVE)/common.mk # https://suva.sh/posts/well-documented-makefiles # Go -GO_VERSION ?=1.23.9 +GO_VERSION ?=1.24.7 GO_CONTAINER_IMAGE ?= golang:$(GO_VERSION) # Directories. diff --git a/cloudbuild-nightly.yaml b/cloudbuild-nightly.yaml index ea7376a755..8bd7f68720 100644 --- a/cloudbuild-nightly.yaml +++ b/cloudbuild-nightly.yaml @@ -3,7 +3,7 @@ timeout: 3000s options: substitution_option: ALLOW_LOOSE steps: - - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud@sha256:4e830b673791d5595719bc6c4ca62dce3746b4e20d749e45004254bc6ef0a140' # v20250116-2a05ea7e3d go 1.23.4 + - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud@sha256:63840f133e0dfeea0af9ef391210da7fab9d2676172e2967fccab0cd6110c4e7' # v20250513-9264efb079 go 1.24.3 entrypoint: make env: - DOCKER_CLI_EXPERIMENTAL=enabled diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 635c6aaa77..88aedb0471 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -3,7 +3,7 @@ timeout: 3000s options: substitution_option: ALLOW_LOOSE steps: - - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud@sha256:4e830b673791d5595719bc6c4ca62dce3746b4e20d749e45004254bc6ef0a140' # v20250116-2a05ea7e3d go 1.23.4 + - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud@sha256:63840f133e0dfeea0af9ef391210da7fab9d2676172e2967fccab0cd6110c4e7' # v20250513-9264efb079 go 1.24.3 entrypoint: make env: - DOCKER_CLI_EXPERIMENTAL=enabled diff --git a/go.mod b/go.mod index fc48ae93f3..1ffc472259 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/cluster-api-provider-aws/v2 -go 1.23.1 +go 1.24.0 require ( github.com/alessio/shellescape v1.4.2 diff --git a/hack/tools/Makefile b/hack/tools/Makefile index 186dd81b60..b9baed4e92 100644 --- a/hack/tools/Makefile +++ b/hack/tools/Makefile @@ -45,7 +45,8 @@ ifeq ($(OS), windows) MDBOOK_EXTRACT_COMMAND := unzip -d /tmp endif -GOLANGCI_LINT_VERSION := v1.55.2 +# Use a golangci-lint built with Go >= 1.24 to match repo go.mod +GOLANGCI_LINT_VERSION := v1.60.3 ## -------------------------------------- ## Tooling Binaries ## --------------------------------------