Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update go version to 1.21 #1621

Merged
merged 1 commit into from
Feb 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ linters-settings:
allow-leading-space: false
require-specific: true
staticcheck:
go: "1.20"
go: "1.21"
stylecheck:
go: "1.20"
go: "1.21"
gosec:
excludes:
- G307 # Deferring unsafe method "Close" on type "\*os.File"
Expand All @@ -126,7 +126,7 @@ linters-settings:
- whyNoLint
- wrapperFunc
unused:
go: "1.20"
go: "1.21"
issues:
max-same-issues: 0
max-issues-per-linter: 0
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ RELEASE_DIR := out
OUTPUT_TYPE ?= type=registry

# Go
GO_VERSION ?=1.20.12
GO_VERSION ?=1.21.7
GO_CONTAINER_IMAGE ?= golang:$(GO_VERSION)

# kind
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module sigs.k8s.io/cluster-api-provider-ibmcloud

go 1.20
go 1.21

// Keep these modules sync with sigs.k8s.io/cluster-api repository
replace (
Expand Down
44 changes: 44 additions & 0 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion hack/ccm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

# Go
GO_VERSION ?=1.20.12
GO_VERSION ?=1.21.7
GO_CONTAINER_IMAGE ?= golang:$(GO_VERSION)

REGISTRY=gcr.io/k8s-staging-capi-ibmcloud
Expand Down
2 changes: 1 addition & 1 deletion hack/ensure-go.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ EOF
local go_version
IFS=" " read -ra go_version <<< "$(go version)"
local minimum_go_version
minimum_go_version=go1.20.0
minimum_go_version=go1.21.0
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
cat <<EOF
Detected go version: ${go_version[*]}.
Expand Down
2 changes: 1 addition & 1 deletion hack/tools/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module sigs.k8s.io/cluster-api-provider-ibmcloud/hack/tools

go 1.20
go 1.21

replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.6.1

Expand Down
79 changes: 79 additions & 0 deletions hack/tools/go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ command = "make -C docs/book build"
publish = "docs/book/book"

[build.environment]
GO_VERSION = "1.20"
GO_VERSION = "1.21"

# Standard Netlify redirects
[[redirects]]
Expand Down