Merge pull request #5078 from nrb/go1.22

🌱 Update Go version to 1.22.6
kubernetes-sigs · Aug 13, 2024 · 111ea90 · 111ea90
2 parents 2b7d990 + 0108e27
commit 111ea90
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v5
       with:
-        go-version: '1.21'
+        go-version: '1.22'
       id: go
     - name: Check out code into the Go module directory
       uses: actions/checkout@v4.1.1

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -20,7 +20,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22'
       - name: Set version info
         run: |
           echo "VERSION=${GITHUB_REF_NAME}" >> $GITHUB_ENV

diff --git a/.golangci.yml b/.golangci.yml
@@ -211,9 +211,9 @@ linters-settings:
     allow-leading-space: false
     require-specific: true
   staticcheck:
-    go: "1.21"
+    go: "1.22"
   stylecheck:
-    go: "1.21"
+    go: "1.22"
   depguard:
     rules:
       main:

diff --git a/Makefile b/Makefile
@@ -20,7 +20,7 @@ include $(ROOT_DIR_RELATIVE)/common.mk
 # https://suva.sh/posts/well-documented-makefiles
 
 # Go
-GO_VERSION ?=1.21.5
+GO_VERSION ?=1.22.6
 GO_CONTAINER_IMAGE ?= golang:$(GO_VERSION)
 
 # Directories.

diff --git a/docs/book/src/development/development.md b/docs/book/src/development/development.md
@@ -5,7 +5,7 @@
 ### Install prerequisites
 
 1. Install [go][go]
-    - Get the latest patch version for go v1.21.
+    - Get the latest patch version for go v1.22.
 2. Install [jq][jq]
     - `brew install jq` on macOS.
     - `chocolatey install jq` on Windows.

diff --git a/docs/triage-party/Dockerfile b/docs/triage-party/Dockerfile
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 
-FROM golang:1.21.5  as builder
+FROM golang:1.22.6  as builder
 
 RUN go get github.com/google/triage-party/cmd/server
 RUN go install github.com/google/triage-party/cmd/server@latest

diff --git a/docs/triage-party/go.mod b/docs/triage-party/go.mod
@@ -1,6 +1,6 @@
 module triage-party-deployment
 
-go 1.21
+go 1.22
 
 require (
 	github.com/aws/aws-cdk-go/awscdk v1.110.0-devpreview

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.21.5
+  minimum_go_version=go1.22.5
   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,8 +1,8 @@
 module sigs.k8s.io/cluster-api-provider-aws/hack/tools
 
-go 1.21
+go 1.22
 
-toolchain go1.21.5
+toolchain go1.22.6
 
 // kube-openapi should match the version imported by kustomize.
 replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f

diff --git a/netlify.toml b/netlify.toml
@@ -4,7 +4,7 @@
     publish = "docs/book/book"
 
 [build.environment]
-    GO_VERSION = "1.21.5"
+    GO_VERSION = "1.22.6"
 
 # Standard Netlify redirects
 [[redirects]]