diff --git a/.golangci.yml b/.golangci.yml index a3eb71c36cd7..812acedab788 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,6 +1,6 @@ run: timeout: 10m - go: "1.21" + go: "1.22" build-tags: - tools - e2e diff --git a/Makefile b/Makefile index c45597b4d193..0fb442e6db5d 100644 --- a/Makefile +++ b/Makefile @@ -23,8 +23,8 @@ SHELL:=/usr/bin/env bash # # Go. # -GO_VERSION ?= 1.21.9 -GO_DIRECTIVE_VERSION ?= 1.21 +GO_VERSION ?= 1.22.2 +GO_DIRECTIVE_VERSION ?= 1.22.0 GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION) # Use GOPROXY environment variable if set diff --git a/Tiltfile b/Tiltfile index 3f072e883c6c..480b553d21b1 100644 --- a/Tiltfile +++ b/Tiltfile @@ -184,9 +184,9 @@ def load_provider_tiltfiles(): tilt_helper_dockerfile_header = """ # Tilt image -FROM golang:1.21.9 as tilt-helper +FROM golang:1.22.2 as tilt-helper # Install delve. Note this should be kept in step with the Go release minor version. -RUN go install github.com/go-delve/delve/cmd/dlv@v1.21 +RUN go install github.com/go-delve/delve/cmd/dlv@v1.22 # Support live reloading with Tilt RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/tilt-dev/rerun-process-wrapper/master/restart.sh && \ wget --output-document /start.sh --quiet https://raw.githubusercontent.com/tilt-dev/rerun-process-wrapper/master/start.sh && \ @@ -195,7 +195,7 @@ RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com """ tilt_dockerfile_header = """ -FROM golang:1.21.9 as tilt +FROM golang:1.22.2 as tilt WORKDIR / COPY --from=tilt-helper /process.txt . COPY --from=tilt-helper /start.sh . diff --git a/cloudbuild-nightly.yaml b/cloudbuild-nightly.yaml index 663788ba95b9..a99bedf039fd 100644 --- a/cloudbuild-nightly.yaml +++ b/cloudbuild-nightly.yaml @@ -5,7 +5,7 @@ options: substitution_option: ALLOW_LOOSE machineType: 'E2_HIGHCPU_8' steps: - - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20230522-312425ae46' + - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud@sha256:de53ba7cd20326776a00adb065430a8bb51beaf24876ffcbd4e8f71b74dbc22d' # v20240210-29014a6e3a entrypoint: make env: - DOCKER_CLI_EXPERIMENTAL=enabled diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 1ef17030d2e2..6c11dbf236b0 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -5,7 +5,7 @@ options: substitution_option: ALLOW_LOOSE machineType: 'E2_HIGHCPU_8' steps: - - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20230522-312425ae46' + - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud@sha256:de53ba7cd20326776a00adb065430a8bb51beaf24876ffcbd4e8f71b74dbc22d' # v20240210-29014a6e3a entrypoint: make env: - DOCKER_CLI_EXPERIMENTAL=enabled diff --git a/go.mod b/go.mod index cf776b4fb513..7ac253820a83 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/cluster-api -go 1.21 +go 1.22.0 require ( github.com/MakeNowJust/heredoc v1.0.0 diff --git a/hack/ensure-go.sh b/hack/ensure-go.sh index 96f0567f86c5..b5cbed218d81 100755 --- a/hack/ensure-go.sh +++ b/hack/ensure-go.sh @@ -38,7 +38,7 @@ EOF local go_version IFS=" " read -ra go_version <<< "$(go version)" local minimum_go_version - minimum_go_version=go1.21 + minimum_go_version=go1.22 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 cat < ../../ diff --git a/netlify.toml b/netlify.toml index eb89b22664db..86d48c9a2605 100644 --- a/netlify.toml +++ b/netlify.toml @@ -4,7 +4,7 @@ publish = "docs/book/book" [build.environment] - GO_VERSION = "1.21" + GO_VERSION = "1.22.2" # Standard Netlify redirects [[redirects]] diff --git a/test/go.mod b/test/go.mod index 8fad246014fb..723318ae0f8b 100644 --- a/test/go.mod +++ b/test/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/cluster-api/test -go 1.21 +go 1.22.0 replace sigs.k8s.io/cluster-api => ../