Merge pull request #18128 from ArkaSaha30/main-cve-2024-24790

Bump Go version to 1.22.4: CVE 2024-24790 fix
etcd-io · Jun 5, 2024 · 6216cbf · 6216cbf
2 parents 179a09e + 2089857
commit 6216cbf
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 16 deletions.
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.22.3
+1.22.4
diff --git a/CHANGELOG/CHANGELOG-3.4.md b/CHANGELOG/CHANGELOG-3.4.md
@@ -10,7 +10,7 @@ Previous change logs can be found at [CHANGELOG-3.3](https://github.com/etcd-io/
 - Fix [Memberlist results not updated when proxy node down](https://github.com/etcd-io/etcd/pull/17896).
 
 ### Dependencies
-- Compile binaries using go [1.21.10](https://github.com/etcd-io/etcd/pull/17981).
+- Compile binaries using go [1.21.11](https://github.com/etcd-io/etcd/pull/18130).
 - Upgrade [bbolt to 1.3.10](https://github.com/etcd-io/etcd/pull/17945).
 
 <hr>

diff --git a/CHANGELOG/CHANGELOG-3.5.md b/CHANGELOG/CHANGELOG-3.5.md
@@ -6,7 +6,9 @@ Previous change logs can be found at [CHANGELOG-3.4](https://github.com/etcd-io/
 
 ## v3.5.15 (TBD)
 
-<hr>
+### Dependencies
+- Compile binaries using [go 1.21.11](https://github.com/etcd-io/etcd/pull/18129).
+
 
 ## v3.5.14 (2024-05-29)
 

diff --git a/api/go.mod b/api/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/api/v3
 
 go 1.22
 
-toolchain go1.22.3
+toolchain go1.22.4
 
 require (
 	github.com/coreos/go-semver v0.3.1

diff --git a/client/internal/v2/go.mod b/client/internal/v2/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/client/v2
 
 go 1.22
 
-toolchain go1.22.3
+toolchain go1.22.4
 
 require (
 	go.etcd.io/etcd/api/v3 v3.6.0-alpha.0

diff --git a/client/pkg/go.mod b/client/pkg/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/client/pkg/v3
 
 go 1.22
 
-toolchain go1.22.3
+toolchain go1.22.4
 
 require (
 	github.com/coreos/go-systemd/v22 v22.5.0

diff --git a/client/v3/go.mod b/client/v3/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/client/v3
 
 go 1.22
 
-toolchain go1.22.3
+toolchain go1.22.4
 
 require (
 	github.com/coreos/go-semver v0.3.1

diff --git a/etcdctl/go.mod b/etcdctl/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/etcdctl/v3
 
 go 1.22
 
-toolchain go1.22.3
+toolchain go1.22.4
 
 require (
 	github.com/bgentry/speakeasy v0.1.0

diff --git a/etcdutl/go.mod b/etcdutl/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/etcdutl/v3
 
 go 1.22
 
-toolchain go1.22.3
+toolchain go1.22.4
 
 replace (
 	go.etcd.io/etcd/api/v3 => ../api

diff --git a/go.mod b/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/v3
 
 go 1.22
 
-toolchain go1.22.3
+toolchain go1.22.4
 
 replace (
 	go.etcd.io/etcd/api/v3 => ./api

diff --git a/pkg/go.mod b/pkg/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/pkg/v3
 
 go 1.22
 
-toolchain go1.22.3
+toolchain go1.22.4
 
 require (
 	github.com/creack/pty v1.1.18

diff --git a/server/go.mod b/server/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/server/v3
 
 go 1.22
 
-toolchain go1.22.3
+toolchain go1.22.4
 
 require (
 	github.com/coreos/go-semver v0.3.1

diff --git a/tests/go.mod b/tests/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/tests/v3
 
 go 1.22
 
-toolchain go1.22.3
+toolchain go1.22.4
 
 replace (
 	go.etcd.io/etcd/api/v3 => ../api

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.22.1
 
-toolchain go1.22.3
+toolchain go1.22.4
 
 require (
 	github.com/alexfalkowski/gocovmerge v1.3.4

diff --git a/tools/rw-heatmaps/go.mod b/tools/rw-heatmaps/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/tools/rw-heatmaps/v3
 
 go 1.22
 
-toolchain go1.22.3
+toolchain go1.22.4
 
 require (
 	github.com/spf13/cobra v1.8.0

diff --git a/tools/testgrid-analysis/go.mod b/tools/testgrid-analysis/go.mod
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/tools/testgrid-analysis/v3
 
 go 1.22
 
-toolchain go1.22.3
+toolchain go1.22.4
 
 require (
 	github.com/GoogleCloudPlatform/testgrid v0.0.173