Merge pull request #16401 from jmhbnz/update-to-go-1.20

[3.5] Backport update to golang 1.20 minor release
etcd-io · Aug 17, 2023 · 2d2e75d · 2d2e75d
2 parents 5d7c457 + f62a894
commit 2d2e75d
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 15 deletions.
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.19.12
+1.20.7
diff --git a/Makefile b/Makefile
@@ -55,7 +55,7 @@ docker-remove:
 
 
 
-GO_VERSION ?= 1.19.9
+GO_VERSION ?= 1.20.7
 ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound")
 
 TEST_SUFFIX = $(shell date +%s | base64 | head -c 15)

diff --git a/api/go.mod b/api/go.mod
@@ -1,6 +1,6 @@
 module go.etcd.io/etcd/api/v3
 
-go 1.19
+go 1.20
 
 require (
 	github.com/coreos/go-semver v0.3.0

diff --git a/client/pkg/go.mod b/client/pkg/go.mod
@@ -1,6 +1,6 @@
 module go.etcd.io/etcd/client/pkg/v3
 
-go 1.19
+go 1.20
 
 require (
 	github.com/coreos/go-systemd/v22 v22.3.2

diff --git a/client/v2/go.mod b/client/v2/go.mod
@@ -1,6 +1,6 @@
 module go.etcd.io/etcd/client/v2
 
-go 1.19
+go 1.20
 
 require (
 	github.com/json-iterator/go v1.1.11

diff --git a/client/v3/go.mod b/client/v3/go.mod
@@ -1,6 +1,6 @@
 module go.etcd.io/etcd/client/v3
 
-go 1.19
+go 1.20
 
 require (
 	github.com/dustin/go-humanize v1.0.0

diff --git a/etcdctl/go.mod b/etcdctl/go.mod
@@ -1,6 +1,6 @@
 module go.etcd.io/etcd/etcdctl/v3
 
-go 1.19
+go 1.20
 
 require (
 	github.com/bgentry/speakeasy v0.1.0

diff --git a/etcdutl/go.mod b/etcdutl/go.mod
@@ -1,6 +1,6 @@
 module go.etcd.io/etcd/etcdutl/v3
 
-go 1.19
+go 1.20
 
 replace (
 	go.etcd.io/etcd/api/v3 => ../api

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module go.etcd.io/etcd/v3
 
-go 1.19
+go 1.20
 
 replace (
 	go.etcd.io/etcd/api/v3 => ./api

diff --git a/pkg/go.mod b/pkg/go.mod
@@ -1,6 +1,6 @@
 module go.etcd.io/etcd/pkg/v3
 
-go 1.19
+go 1.20
 
 require (
 	github.com/creack/pty v1.1.11

diff --git a/raft/go.mod b/raft/go.mod
@@ -1,6 +1,6 @@
 module go.etcd.io/etcd/raft/v3
 
-go 1.19
+go 1.20
 
 require (
 	github.com/cockroachdb/datadriven v1.0.2

diff --git a/server/etcdserver/api/rafthttp/transport.go b/server/etcdserver/api/rafthttp/transport.go
@@ -110,7 +110,7 @@ type Transport struct {
 	Raft        Raft       // raft state machine, to which the Transport forwards received messages and reports status
 	Snapshotter *snap.Snapshotter
 	ServerStats *stats.ServerStats // used to record general transportation statistics
-	// used to record transportation statistics with followers when
+	// LeaderStats is used to record transportation statistics with followers when
 	// performing as leader in raft protocol
 	LeaderStats *stats.LeaderStats
 	// ErrorC is used to report detected critical errors, e.g.,

diff --git a/server/go.mod b/server/go.mod
@@ -1,6 +1,6 @@
 module go.etcd.io/etcd/server/v3
 
-go 1.19
+go 1.20
 
 require (
 	github.com/coreos/go-semver v0.3.0

diff --git a/tests/go.mod b/tests/go.mod
@@ -1,6 +1,6 @@
 module go.etcd.io/etcd/tests/v3
 
-go 1.19
+go 1.20
 
 replace (
 	go.etcd.io/etcd/api/v3 => ../api

diff --git a/tools/mod/go.mod b/tools/mod/go.mod
@@ -1,6 +1,6 @@
 module go.etcd.io/etcd/tools/v3
 
-go 1.19
+go 1.20
 
 require (
 	github.com/akhenakh/hunspellgo v0.0.0-20160221122622-9db38fa26e19 // indirect