Update go version to 1.21

kubernetes-sigs · Feb 16, 2024 · 5a9b489 · 5a9b489
1 parent 61b843e
commit 5a9b489
Show file tree

Hide file tree

Showing 9 changed files with 132 additions and 9 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -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"
@@ -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

diff --git a/Makefile b/Makefile
@@ -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

diff --git a/go.mod b/go.mod
@@ -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 (

diff --git a/go.sum b/go.sum
diff --git a/hack/ccm/Makefile b/hack/ccm/Makefile
@@ -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

diff --git a/hack/ensure-go.sh b/hack/ensure-go.sh
@@ -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[*]}.

diff --git a/hack/tools/go.mod b/hack/tools/go.mod
@@ -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
 

diff --git a/hack/tools/go.sum b/hack/tools/go.sum
diff --git a/netlify.toml b/netlify.toml
@@ -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]]