Skip to content

Commit b169ddf

Browse files
authored
Merge pull request #380 from Fedosin/go121
🌱 Bump go version to v1.21
2 parents 2c1cccb + 460eb3c commit b169ddf

File tree

11 files changed

+87
-8
lines changed

11 files changed

+87
-8
lines changed

.github/workflows/golangci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v4
1515
- uses: actions/setup-go@v5
1616
with:
17-
go-version: '1.20'
17+
go-version: '1.21'
1818
- name: golangci-lint
1919
uses: golangci/golangci-lint-action@v4
2020
with:

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Set up Go
2323
uses: actions/setup-go@v5
2424
with:
25-
go-version: '1.20'
25+
go-version: '1.21'
2626
- name: Run GoReleaser
2727
uses: goreleaser/goreleaser-action@v5
2828
with:

.golangci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
run:
22
timeout: 5m
3-
go: "1.20"
3+
go: "1.21"
44
skip-files:
55
- "zz_generated.*\\.go$"
66
allow-parallel-runners: true

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ROOT:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
2323

2424
.DEFAULT_GOAL:=help
2525

26-
GO_VERSION ?= 1.20.4
26+
GO_VERSION ?= 1.21.8
2727
GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)
2828

2929
# Use GOPROXY environment variable if set

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-operator
22

3-
go 1.20
3+
go 1.21
44

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

go.sum

Lines changed: 33 additions & 0 deletions
Large diffs are not rendered by default.

hack/chart-update/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-operator/hack/chart-update
22

3-
go 1.20
3+
go 1.21
44

55
require (
66
github.com/google/go-github/v50 v50.2.0

hack/chart-update/go.sum

Lines changed: 34 additions & 0 deletions
Large diffs are not rendered by default.

hack/ensure-go.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ EOF
3131
local go_version
3232
IFS=" " read -ra go_version <<< "$(go version)"
3333
local minimum_go_version
34-
minimum_go_version=go1.20.4
34+
minimum_go_version=go1.21.8
3535
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
3636
cat <<EOF
3737
Detected go version: ${go_version[*]}.

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

3-
go 1.20
3+
go 1.21
44

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

0 commit comments

Comments
 (0)