Skip to content

Commit f86dd78

Browse files
committed
Bump go toolchain version to address CVE-2023-45288
Changes: - Bump release-3.6 toolchain version to 1.22.2 due to CVE-2023-45288 - Bump golang.org/x/net to v0.23.0 - Update CHANGELOG-3.4, CHANGELOG-3.5, and CHANGELOG-3.6 - Bump go version in rw-heatmaps (which was still at 1.21 where everything else is at 1.22) Reference: - PR etcd-io#17703 Signed-off-by: Chun-Hung Tseng <henrybear327@gmail.com>
1 parent 24f5f06 commit f86dd78

File tree

7 files changed

+14
-6
lines changed

7 files changed

+14
-6
lines changed

.go-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.22.1
1+
1.22.2

CHANGELOG/CHANGELOG-3.4.md

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ Previous change logs can be found at [CHANGELOG-3.3](https://github.com/etcd-io/
99
### Package `clientv3`
1010
- Add [requests retry when receiving ErrGPRCNotSupportedForLearner and endpoints > 1](https://github.com/etcd-io/etcd/pull/17692).
1111

12+
### Dependencies
13+
- Compile binaries using [go 1.21.9](https://github.com/etcd-io/etcd/pull/17709).
14+
1215
<hr>
1316

1417
## v3.4.31 (2024-03-21)

CHANGELOG/CHANGELOG-3.5.md

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ Previous change logs can be found at [CHANGELOG-3.4](https://github.com/etcd-io/
99
### Package `clientv3`
1010
- Add [requests retry when receiving ErrGPRCNotSupportedForLearner and endpoints > 1](https://github.com/etcd-io/etcd/pull/17641).
1111

12+
### Dependencies
13+
- Compile binaries using [go 1.21.9](https://github.com/etcd-io/etcd/pull/17708).
14+
1215
<hr>
1316

1417
## v3.5.13 (2024-03-29)

CHANGELOG/CHANGELOG-3.6.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ See [List of metrics](https://etcd.io/docs/latest/metrics/) for all metrics per
9393
- Add [`etcd_debugging_server_alarms`](https://github.com/etcd-io/etcd/pull/14276).
9494

9595
### Go
96-
- Require [Go 1.21+](https://github.com/etcd-io/etcd/pull/16594).
97-
- Compile with [Go 1.21+](https://go.dev/doc/devel/release#go1.21.minor). Please refer to [gc-guide](https://go.dev/doc/gc-guide) to configure `GOGC` and `GOMEMLIMIT` properly.
96+
- Require [Go 1.22+](https://github.com/etcd-io/etcd/pull/16594).
97+
- Compile with [Go 1.22+](https://go.dev/doc/devel/release#go1.21.minor). Please refer to [gc-guide](https://go.dev/doc/gc-guide) to configure `GOGC` and `GOMEMLIMIT` properly.
9898

9999
### Other
100100

go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module go.etcd.io/etcd/v3
22

33
go 1.22
44

5-
toolchain go1.22.1
5+
toolchain go1.22.2
66

77
replace (
88
go.etcd.io/etcd/api/v3 => ./api
@@ -88,7 +88,7 @@ require (
8888
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
8989
go.uber.org/multierr v1.11.0 // indirect
9090
golang.org/x/crypto v0.21.0 // indirect
91-
golang.org/x/net v0.22.0 // indirect
91+
golang.org/x/net v0.23.0 // indirect
9292
golang.org/x/sys v0.18.0 // indirect
9393
golang.org/x/text v0.14.0 // indirect
9494
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect

go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
185185
golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
186186
golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
187187
golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
188+
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
189+
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
188190
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
189191
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
190192
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

tools/rw-heatmaps/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module go.etcd.io/etcd/tools/rw-heatmaps/v3
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/spf13/cobra v1.8.0

0 commit comments

Comments
 (0)