Skip to content

Commit 0a5cd7e

Browse files
authored
Merge pull request #10801 from sbueringer/pr-1.7-go-1.22.4
[release-1.7] ✨ Bump to Go 1.22.4
2 parents 8af79e5 + 2bee8cf commit 0a5cd7e

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ SHELL:=/usr/bin/env bash
2323
#
2424
# Go.
2525
#
26-
GO_VERSION ?= 1.21.11
26+
GO_VERSION ?= 1.22.4
2727
GO_DIRECTIVE_VERSION ?= 1.21
2828
GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)
2929

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.11 as tilt-helper
187+
FROM golang:1.22.4 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.11 as tilt
198+
FROM golang:1.22.4 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: 2 additions & 2 deletions
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
@@ -17,4 +17,4 @@ substitutions:
1717
# _GIT_TAG will be filled with a git-based tag for the image, of the form vYYYYMMDD-hash, and
1818
# can be used as a substitution
1919
_GIT_TAG: '12345'
20-
_PULL_BASE_REF: 'dev'
20+
_PULL_BASE_REF: 'dev'

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[*]}.

0 commit comments

Comments
 (0)