Skip to content

Commit f085905

Browse files
authored
Merge pull request kubernetes-sigs#10152 from sbueringer/release-1.6-go-1.21
[release-1.6] 🌱 Bump Go to 1.21.5
2 parents ff6ed3f + 2086542 commit f085905

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
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.20"
3+
go: "1.21"
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.20.12
26+
GO_VERSION ?= 1.21.5
2727
GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)
2828

2929
# 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.20.12 as tilt-helper
187+
FROM golang:1.21.5 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.20
189+
RUN go install github.com/go-delve/delve/cmd/dlv@v1.21
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.20.12 as tilt
198+
FROM golang:1.21.5 as tilt
199199
WORKDIR /
200200
COPY --from=tilt-helper /process.txt .
201201
COPY --from=tilt-helper /start.sh .

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.20
41+
minimum_go_version=go1.21
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)