Skip to content

Commit 13c565f

Browse files
authored
Merge pull request kubernetes-sigs#10452 from chrischdi/pr-go-1-22-2
🌱 Bump Go to v1.22.2
2 parents d098cb1 + 6b51d70 commit 13c565f

File tree

10 files changed

+13
-13
lines changed

10 files changed

+13
-13
lines changed

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
run:
22
timeout: 10m
3-
go: "1.21"
3+
go: "1.22"
44
build-tags:
55
- tools
66
- e2e

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ SHELL:=/usr/bin/env bash
2323
#
2424
# Go.
2525
#
26-
GO_VERSION ?= 1.21.9
27-
GO_DIRECTIVE_VERSION ?= 1.21
26+
GO_VERSION ?= 1.22.2
27+
GO_DIRECTIVE_VERSION ?= 1.22.0
2828
GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)
2929

3030
# Use GOPROXY environment variable if set

Tiltfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,9 @@ def load_provider_tiltfiles():
184184

185185
tilt_helper_dockerfile_header = """
186186
# Tilt image
187-
FROM golang:1.21.9 as tilt-helper
187+
FROM golang:1.22.2 as tilt-helper
188188
# Install delve. Note this should be kept in step with the Go release minor version.
189-
RUN go install github.com/go-delve/delve/cmd/dlv@v1.21
189+
RUN go install github.com/go-delve/delve/cmd/dlv@v1.22
190190
# Support live reloading with Tilt
191191
RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/tilt-dev/rerun-process-wrapper/master/restart.sh && \
192192
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
195195
"""
196196

197197
tilt_dockerfile_header = """
198-
FROM golang:1.21.9 as tilt
198+
FROM golang:1.22.2 as tilt
199199
WORKDIR /
200200
COPY --from=tilt-helper /process.txt .
201201
COPY --from=tilt-helper /start.sh .

cloudbuild-nightly.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ options:
55
substitution_option: ALLOW_LOOSE
66
machineType: 'E2_HIGHCPU_8'
77
steps:
8-
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20230522-312425ae46'
8+
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud@sha256:de53ba7cd20326776a00adb065430a8bb51beaf24876ffcbd4e8f71b74dbc22d' # v20240210-29014a6e3a
99
entrypoint: make
1010
env:
1111
- DOCKER_CLI_EXPERIMENTAL=enabled

cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ options:
55
substitution_option: ALLOW_LOOSE
66
machineType: 'E2_HIGHCPU_8'
77
steps:
8-
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20230522-312425ae46'
8+
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud@sha256:de53ba7cd20326776a00adb065430a8bb51beaf24876ffcbd4e8f71b74dbc22d' # v20240210-29014a6e3a
99
entrypoint: make
1010
env:
1111
- 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
22

3-
go 1.21
3+
go 1.22.0
44

55
require (
66
github.com/MakeNowJust/heredoc v1.0.0

hack/ensure-go.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ EOF
3838
local go_version
3939
IFS=" " read -ra go_version <<< "$(go version)"
4040
local minimum_go_version
41-
minimum_go_version=go1.21
41+
minimum_go_version=go1.22
4242
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
4343
cat <<EOF
4444
Detected go version: ${go_version[*]}.

hack/tools/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/hack/tools
22

3-
go 1.21
3+
go 1.22.0
44

55
replace sigs.k8s.io/cluster-api => ../../
66

netlify.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
publish = "docs/book/book"
55

66
[build.environment]
7-
GO_VERSION = "1.21"
7+
GO_VERSION = "1.22.2"
88

99
# Standard Netlify redirects
1010
[[redirects]]

test/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/test
22

3-
go 1.21
3+
go 1.22.0
44

55
replace sigs.k8s.io/cluster-api => ../
66

0 commit comments

Comments
 (0)