From bb4b70bbb25afeb2e44ab3875b4014364d55d5bc Mon Sep 17 00:00:00 2001 From: Allen Ray Date: Wed, 7 Feb 2024 10:39:12 -0500 Subject: [PATCH] Migrate to go1.22 Signed-off-by: Allen Ray --- .devcontainer/devcontainer.json | 20 +++++++++----------- .go-version | 2 +- api/go.mod | 2 +- client/internal/v2/go.mod | 2 +- client/pkg/go.mod | 2 +- client/v3/go.mod | 2 +- etcdctl/go.mod | 2 +- etcdutl/go.mod | 2 +- go.mod | 4 +++- pkg/go.mod | 2 +- server/go.mod | 2 +- tests/go.mod | 2 +- tools/mod/go.mod | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 57aab46358d..fc2b85e4a34 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,23 +2,21 @@ // README at: https://github.com/devcontainers/templates/tree/main/src/go { "name": "Go", - // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "mcr.microsoft.com/devcontainers/go:1.21-bookworm", - + "image": "mcr.microsoft.com/devcontainers/go:1.22-bookworm", // Features to add to the dev container. More info: https://containers.dev/features. "features": { - "ghcr.io/devcontainers/features/docker-in-docker:2": {}, - "ghcr.io/devcontainers/features/github-cli:1": {}, - "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {} + "ghcr.io/devcontainers/features/docker-in-docker:2": {}, + "ghcr.io/devcontainers/features/github-cli:1": {}, + "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {} }, - // Use 'forwardPorts' to make a list of ports inside the container available locally. - "forwardPorts": [2379, 2380], - + "forwardPorts": [ + 2379, + 2380 + ], // Use 'postCreateCommand' to run commands after the container is created. "postCreateCommand": "make build" - // Configure tool-specific properties. // "customizations": {}, -} +} \ No newline at end of file diff --git a/.go-version b/.go-version index c262b1f0dfd..6245beecd39 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.6 +1.22.1 diff --git a/api/go.mod b/api/go.mod index ec545fd5380..f78a68d3a4d 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/api/v3 -go 1.21 +go 1.22 require ( github.com/coreos/go-semver v0.3.1 diff --git a/client/internal/v2/go.mod b/client/internal/v2/go.mod index b12846b6eec..8565b2394d3 100644 --- a/client/internal/v2/go.mod +++ b/client/internal/v2/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/client/v2 -go 1.21 +go 1.22 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 6e1264d0361..890aa2ac12f 100644 --- a/client/pkg/go.mod +++ b/client/pkg/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/client/pkg/v3 -go 1.21 +go 1.22 require ( github.com/coreos/go-systemd/v22 v22.5.0 diff --git a/client/v3/go.mod b/client/v3/go.mod index 7409882ed5d..d68c1233ae9 100644 --- a/client/v3/go.mod +++ b/client/v3/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/client/v3 -go 1.21 +go 1.22 require ( github.com/coreos/go-semver v0.3.1 diff --git a/etcdctl/go.mod b/etcdctl/go.mod index 8a154b38ea1..fe715e4ed49 100644 --- a/etcdctl/go.mod +++ b/etcdctl/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/etcdctl/v3 -go 1.21 +go 1.22 require ( github.com/bgentry/speakeasy v0.1.0 diff --git a/etcdutl/go.mod b/etcdutl/go.mod index 2af7c6891d8..edf66570763 100644 --- a/etcdutl/go.mod +++ b/etcdutl/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/etcdutl/v3 -go 1.21 +go 1.22 replace ( go.etcd.io/etcd/api/v3 => ../api diff --git a/go.mod b/go.mod index 693e780b197..f66797c12de 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module go.etcd.io/etcd/v3 -go 1.21 +go 1.22 + +toolchain go1.22.1 replace ( go.etcd.io/etcd/api/v3 => ./api diff --git a/pkg/go.mod b/pkg/go.mod index 8b93875757c..104cf47eaed 100644 --- a/pkg/go.mod +++ b/pkg/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/pkg/v3 -go 1.21 +go 1.22 require ( github.com/creack/pty v1.1.18 diff --git a/server/go.mod b/server/go.mod index b55696ce97b..4739f190832 100644 --- a/server/go.mod +++ b/server/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/server/v3 -go 1.21 +go 1.22 require ( github.com/coreos/go-semver v0.3.1 diff --git a/tests/go.mod b/tests/go.mod index 0005e203752..62e8047c0dc 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/tests/v3 -go 1.21 +go 1.22 replace ( go.etcd.io/etcd/api/v3 => ../api diff --git a/tools/mod/go.mod b/tools/mod/go.mod index 9c90654496c..eae3a33a6bb 100644 --- a/tools/mod/go.mod +++ b/tools/mod/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/tools/v3 -go 1.21 +go 1.22 require ( github.com/alexfalkowski/gocovmerge v1.2.6