From 6369020bd2649ef5097ad64873782bc51b775463 Mon Sep 17 00:00:00 2001 From: Chun-Hung Tseng Date: Wed, 14 Aug 2024 23:48:01 +0200 Subject: [PATCH] Bump go toolchain to 1.23.0 Reference: - https://github.com/etcd-io/etcd/issues/18543 - https://github.com/kubernetes/release/issues/3650 Signed-off-by: Chun-Hung Tseng --- .devcontainer/devcontainer.json | 2 +- .go-version | 2 +- CHANGELOG/CHANGELOG-3.6.md | 4 ++-- api/go.mod | 4 ++-- client/internal/v2/go.mod | 4 ++-- client/pkg/go.mod | 4 ++-- client/v3/go.mod | 4 ++-- etcdctl/go.mod | 4 ++-- etcdutl/go.mod | 4 ++-- go.mod | 4 ++-- pkg/go.mod | 4 ++-- server/go.mod | 4 ++-- tests/go.mod | 4 ++-- tools/mod/go.mod | 4 ++-- tools/rw-heatmaps/go.mod | 4 ++-- tools/testgrid-analysis/go.mod | 4 ++-- 16 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index fc2b85e4a348..75a99abd7842 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,7 +3,7 @@ { "name": "Go", // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "mcr.microsoft.com/devcontainers/go:1.22-bookworm", + "image": "mcr.microsoft.com/devcontainers/go:1.23-bookworm", // Features to add to the dev container. More info: https://containers.dev/features. "features": { "ghcr.io/devcontainers/features/docker-in-docker:2": {}, diff --git a/.go-version b/.go-version index 87b26e8b1aa0..49e0a31d4964 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.22.7 +1.23.1 diff --git a/CHANGELOG/CHANGELOG-3.6.md b/CHANGELOG/CHANGELOG-3.6.md index 5d182c0f73a8..6e478eda215e 100644 --- a/CHANGELOG/CHANGELOG-3.6.md +++ b/CHANGELOG/CHANGELOG-3.6.md @@ -98,8 +98,8 @@ See [List of metrics](https://etcd.io/docs/latest/metrics/) for all metrics per - Add [`etcd_server_range_duration_seconds`](https://github.com/etcd-io/etcd/pull/17983). ### Go -- Require [Go 1.22+](https://github.com/etcd-io/etcd/pull/16594). -- 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. +- Require [Go 1.23+](https://github.com/etcd-io/etcd/pull/16594). +- Compile with [Go 1.23+](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. ### Other diff --git a/api/go.mod b/api/go.mod index 5e205d618d3a..f2a539885acf 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/api/v3 -go 1.22 +go 1.23 -toolchain go1.22.7 +toolchain go1.23.1 require ( github.com/coreos/go-semver v0.3.1 diff --git a/client/internal/v2/go.mod b/client/internal/v2/go.mod index ce83c178a3b1..0fbbe9c81c33 100644 --- a/client/internal/v2/go.mod +++ b/client/internal/v2/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/client/v2 -go 1.22 +go 1.23 -toolchain go1.22.7 +toolchain go1.23.1 require ( go.etcd.io/etcd/api/v3 v3.6.0-alpha.0 diff --git a/client/pkg/go.mod b/client/pkg/go.mod index 305abde17a78..805d940bc9f4 100644 --- a/client/pkg/go.mod +++ b/client/pkg/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/client/pkg/v3 -go 1.22 +go 1.23 -toolchain go1.22.7 +toolchain go1.23.1 require ( github.com/coreos/go-systemd/v22 v22.5.0 diff --git a/client/v3/go.mod b/client/v3/go.mod index c94d50336750..0bd060fef436 100644 --- a/client/v3/go.mod +++ b/client/v3/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/client/v3 -go 1.22 +go 1.23 -toolchain go1.22.7 +toolchain go1.23.1 require ( github.com/coreos/go-semver v0.3.1 diff --git a/etcdctl/go.mod b/etcdctl/go.mod index bb8535795d12..f180b24193ea 100644 --- a/etcdctl/go.mod +++ b/etcdctl/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/etcdctl/v3 -go 1.22 +go 1.23 -toolchain go1.22.7 +toolchain go1.23.1 require ( github.com/bgentry/speakeasy v0.2.0 diff --git a/etcdutl/go.mod b/etcdutl/go.mod index e20cd2c4467c..42350aa05141 100644 --- a/etcdutl/go.mod +++ b/etcdutl/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/etcdutl/v3 -go 1.22 +go 1.23 -toolchain go1.22.7 +toolchain go1.23.1 replace ( go.etcd.io/etcd/api/v3 => ../api diff --git a/go.mod b/go.mod index 11c29173d37d..52e8cab682d9 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/v3 -go 1.22 +go 1.23 -toolchain go1.22.7 +toolchain go1.23.1 replace ( go.etcd.io/etcd/api/v3 => ./api diff --git a/pkg/go.mod b/pkg/go.mod index 0093271da291..c784ffd4e444 100644 --- a/pkg/go.mod +++ b/pkg/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/pkg/v3 -go 1.22 +go 1.23 -toolchain go1.22.7 +toolchain go1.23.1 require ( github.com/creack/pty v1.1.18 diff --git a/server/go.mod b/server/go.mod index 334779522171..735a665539e9 100644 --- a/server/go.mod +++ b/server/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/server/v3 -go 1.22 +go 1.23 -toolchain go1.22.7 +toolchain go1.23.1 require ( github.com/coreos/go-semver v0.3.1 diff --git a/tests/go.mod b/tests/go.mod index 156283bca7ad..4a17074f0093 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/tests/v3 -go 1.22 +go 1.23 -toolchain go1.22.7 +toolchain go1.23.1 replace ( go.etcd.io/etcd/api/v3 => ../api diff --git a/tools/mod/go.mod b/tools/mod/go.mod index ac02ca85f016..cf9f01c56c92 100644 --- a/tools/mod/go.mod +++ b/tools/mod/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/tools/v3 -go 1.22.1 +go 1.23 -toolchain go1.22.7 +toolchain go1.23.1 require ( github.com/alexfalkowski/gocovmerge v1.3.13 diff --git a/tools/rw-heatmaps/go.mod b/tools/rw-heatmaps/go.mod index 43ffbaa09d1c..6f18f9b4adb9 100644 --- a/tools/rw-heatmaps/go.mod +++ b/tools/rw-heatmaps/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/tools/rw-heatmaps/v3 -go 1.22 +go 1.23 -toolchain go1.22.7 +toolchain go1.23.1 require ( github.com/spf13/cobra v1.8.1 diff --git a/tools/testgrid-analysis/go.mod b/tools/testgrid-analysis/go.mod index b97ce81ee022..94ea5c6bf5ea 100644 --- a/tools/testgrid-analysis/go.mod +++ b/tools/testgrid-analysis/go.mod @@ -1,8 +1,8 @@ module go.etcd.io/etcd/tools/testgrid-analysis/v3 -go 1.22 +go 1.23 -toolchain go1.22.7 +toolchain go1.23.1 require ( github.com/GoogleCloudPlatform/testgrid v0.0.173