Merge pull request #18130 from ArkaSaha30/release-3.4-cve-2024-24790

[3.4]Bump Go version to 1.21.11: CVE 2024-24790 fix
etcd-io · Jun 5, 2024 · 041cd4e · 041cd4e
2 parents 88c2295 + 74533d9
commit 041cd4e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.21.10
+1.21.11
diff --git a/functional/scripts/docker-local-agent.sh b/functional/scripts/docker-local-agent.sh
@@ -13,7 +13,7 @@ if ! [[ "${0}" =~ "scripts/docker-local-agent.sh" ]]; then
 fi
 
 if [[ -z "${GO_VERSION}" ]]; then
-  GO_VERSION=1.21.10
+  GO_VERSION=1.21.11
 fi
 echo "Running with GO_VERSION:" ${GO_VERSION}
 

diff --git a/functional/scripts/docker-local-tester.sh b/functional/scripts/docker-local-tester.sh
@@ -6,7 +6,7 @@ if ! [[ "${0}" =~ "scripts/docker-local-tester.sh" ]]; then
 fi
 
 if [[ -z "${GO_VERSION}" ]]; then
-  GO_VERSION=1.21.10
+  GO_VERSION=1.21.11
 fi
 echo "Running with GO_VERSION:" ${GO_VERSION}
 

diff --git a/go.mod b/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd
 
 go 1.21
 
-toolchain go1.21.10
+toolchain go1.21.11
 
 require (
 	github.com/bgentry/speakeasy v0.1.0

diff --git a/tools/mod/go.mod b/tools/mod/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/tools/v3
 
 go 1.21
 
-toolchain go1.21.10
+toolchain go1.21.11
 
 require (
 	github.com/gogo/protobuf v1.3.2