Skip to content

Commit 58c9290

Browse files
authored
Merge pull request #619 from jkh52/go-1.22
Update golang to 1.22.
2 parents 1b373ad + 6104d87 commit 58c9290

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

.github/workflows/e2e.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ on:
1212

1313
env:
1414
GO_TOOLCHAIN: "golang"
15-
GO_VERSION: "1.21.6"
1615
# TODO: match BASEIMAGE with Makefile default (nonroot variant)
1716
BASEIMAGE: "gcr.io/distroless/static-debian11"
1817
KIND_CLUSTER_NAME: "kind"
@@ -22,15 +21,13 @@ jobs:
2221
name: build
2322
runs-on: ubuntu-20.04
2423
steps:
24+
- name: Check out code
25+
uses: actions/checkout@v4
2526
- name: Set up Go
2627
uses: actions/setup-go@v5
2728
with:
28-
go-version: ${{ env.GO_VERSION }}
29+
go-version-file: go.mod
2930
id: go
30-
31-
- name: Check out code
32-
uses: actions/checkout@v4
33-
3431
- name: Build
3532
run: |
3633
mkdir _output

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ALL_ARCH ?= amd64 arm arm64 ppc64le s390x
2424
# The output type could either be docker (local), or registry.
2525
OUTPUT_TYPE ?= docker
2626
GO_TOOLCHAIN ?= golang
27-
GO_VERSION ?= 1.21.9
27+
GO_VERSION ?= 1.22.2
2828
BASEIMAGE ?= gcr.io/distroless/static-debian11:nonroot
2929

3030
ifeq ($(GOPATH),)

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/apiserver-network-proxy
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/google/uuid v1.6.0

0 commit comments

Comments
 (0)