From 46f4c883bd0a8034c8a68d2537e021f0823a5a92 Mon Sep 17 00:00:00 2001 From: bob Date: Mon, 10 Jun 2024 22:21:30 +0200 Subject: [PATCH] version: bump up to 3.5.14-dd.1 --- api/version/version.go | 2 +- client/v2/go.mod | 4 ++-- client/v3/go.mod | 4 ++-- etcdctl/go.mod | 14 +++++++------- etcdutl/go.mod | 12 ++++++------ go.mod | 18 +++++++++--------- pkg/go.mod | 2 +- raft/go.mod | 2 +- server/go.mod | 10 +++++----- tests/framework/e2e/flags.go | 4 ++-- tests/go.mod | 14 +++++++------- 11 files changed, 43 insertions(+), 43 deletions(-) diff --git a/api/version/version.go b/api/version/version.go index 6b5177fc3cec..971d83a7afd5 100644 --- a/api/version/version.go +++ b/api/version/version.go @@ -26,7 +26,7 @@ import ( var ( // MinClusterVersion is the min cluster version this etcd binary is compatible with. MinClusterVersion = "3.0.0" - Version = "3.5.14" + Version = "3.5.14-dd.1" APIVersion = "unknown" // Git SHA Value will be set during build diff --git a/client/v2/go.mod b/client/v2/go.mod index 3bc4ee6c379b..ee0bf4ca1c39 100644 --- a/client/v2/go.mod +++ b/client/v2/go.mod @@ -7,8 +7,8 @@ toolchain go1.22.4 require ( github.com/json-iterator/go v1.1.11 github.com/modern-go/reflect2 v1.0.1 - go.etcd.io/etcd/api/v3 v3.5.14 - go.etcd.io/etcd/client/pkg/v3 v3.5.14 + go.etcd.io/etcd/api/v3 v3.5.14-dd.1 + go.etcd.io/etcd/client/pkg/v3 v3.5.14-dd.1 ) require ( diff --git a/client/v3/go.mod b/client/v3/go.mod index 530db08f8538..da1661e3fb6f 100644 --- a/client/v3/go.mod +++ b/client/v3/go.mod @@ -8,8 +8,8 @@ require ( github.com/dustin/go-humanize v1.0.0 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 github.com/prometheus/client_golang v1.11.1 - go.etcd.io/etcd/api/v3 v3.5.14 - go.etcd.io/etcd/client/pkg/v3 v3.5.14 + go.etcd.io/etcd/api/v3 v3.5.14-dd.1 + go.etcd.io/etcd/client/pkg/v3 v3.5.14-dd.1 go.uber.org/zap v1.17.0 google.golang.org/grpc v1.59.0 sigs.k8s.io/yaml v1.2.0 diff --git a/etcdctl/go.mod b/etcdctl/go.mod index df14a74fdd36..a909a5f87c91 100644 --- a/etcdctl/go.mod +++ b/etcdctl/go.mod @@ -11,12 +11,12 @@ require ( github.com/spf13/cobra v1.1.3 github.com/spf13/pflag v1.0.5 github.com/urfave/cli v1.22.4 - go.etcd.io/etcd/api/v3 v3.5.14 - go.etcd.io/etcd/client/pkg/v3 v3.5.14 + go.etcd.io/etcd/api/v3 v3.5.14-dd.1 + go.etcd.io/etcd/client/pkg/v3 v3.5.14-dd.1 go.etcd.io/etcd/client/v2 v2.305.14 - go.etcd.io/etcd/client/v3 v3.5.14 - go.etcd.io/etcd/etcdutl/v3 v3.5.14 - go.etcd.io/etcd/pkg/v3 v3.5.14 + go.etcd.io/etcd/client/v3 v3.5.14-dd.1 + go.etcd.io/etcd/etcdutl/v3 v3.5.14-dd.1 + go.etcd.io/etcd/pkg/v3 v3.5.14-dd.1 go.uber.org/zap v1.17.0 golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba google.golang.org/grpc v1.59.0 @@ -50,8 +50,8 @@ require ( github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect go.etcd.io/bbolt v1.3.10 // indirect - go.etcd.io/etcd/raft/v3 v3.5.14 // indirect - go.etcd.io/etcd/server/v3 v3.5.14 // indirect + go.etcd.io/etcd/raft/v3 v3.5.14-dd.1 // indirect + go.etcd.io/etcd/server/v3 v3.5.14-dd.1 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect go.opentelemetry.io/otel v1.20.0 // indirect go.opentelemetry.io/otel/metric v1.20.0 // indirect diff --git a/etcdutl/go.mod b/etcdutl/go.mod index 91e27750d210..a89dd8a66db1 100644 --- a/etcdutl/go.mod +++ b/etcdutl/go.mod @@ -27,12 +27,12 @@ require ( github.com/olekukonko/tablewriter v0.0.5 github.com/spf13/cobra v1.1.3 go.etcd.io/bbolt v1.3.10 - go.etcd.io/etcd/api/v3 v3.5.14 - go.etcd.io/etcd/client/pkg/v3 v3.5.14 - go.etcd.io/etcd/client/v3 v3.5.14 - go.etcd.io/etcd/pkg/v3 v3.5.14 - go.etcd.io/etcd/raft/v3 v3.5.14 - go.etcd.io/etcd/server/v3 v3.5.14 + go.etcd.io/etcd/api/v3 v3.5.14-dd.1 + go.etcd.io/etcd/client/pkg/v3 v3.5.14-dd.1 + go.etcd.io/etcd/client/v3 v3.5.14-dd.1 + go.etcd.io/etcd/pkg/v3 v3.5.14-dd.1 + go.etcd.io/etcd/raft/v3 v3.5.14-dd.1 + go.etcd.io/etcd/server/v3 v3.5.14-dd.1 go.uber.org/zap v1.17.0 ) diff --git a/go.mod b/go.mod index 319fbb3486c6..71b8f4673b2c 100644 --- a/go.mod +++ b/go.mod @@ -22,16 +22,16 @@ require ( github.com/dustin/go-humanize v1.0.0 github.com/spf13/cobra v1.1.3 go.etcd.io/bbolt v1.3.10 - go.etcd.io/etcd/api/v3 v3.5.14 - go.etcd.io/etcd/client/pkg/v3 v3.5.14 + go.etcd.io/etcd/api/v3 v3.5.14-dd.1 + go.etcd.io/etcd/client/pkg/v3 v3.5.14-dd.1 go.etcd.io/etcd/client/v2 v2.305.14 - go.etcd.io/etcd/client/v3 v3.5.14 - go.etcd.io/etcd/etcdctl/v3 v3.5.14 - go.etcd.io/etcd/etcdutl/v3 v3.5.14 - go.etcd.io/etcd/pkg/v3 v3.5.14 - go.etcd.io/etcd/raft/v3 v3.5.14 - go.etcd.io/etcd/server/v3 v3.5.14 - go.etcd.io/etcd/tests/v3 v3.5.14 + go.etcd.io/etcd/client/v3 v3.5.14-dd.1 + go.etcd.io/etcd/etcdctl/v3 v3.5.14-dd.1 + go.etcd.io/etcd/etcdutl/v3 v3.5.14-dd.1 + go.etcd.io/etcd/pkg/v3 v3.5.14-dd.1 + go.etcd.io/etcd/raft/v3 v3.5.14-dd.1 + go.etcd.io/etcd/server/v3 v3.5.14-dd.1 + go.etcd.io/etcd/tests/v3 v3.5.14-dd.1 go.uber.org/zap v1.17.0 golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba google.golang.org/grpc v1.59.0 diff --git a/pkg/go.mod b/pkg/go.mod index f26c760325c3..915990d17f7b 100644 --- a/pkg/go.mod +++ b/pkg/go.mod @@ -10,7 +10,7 @@ require ( github.com/spf13/cobra v1.1.3 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.4 - go.etcd.io/etcd/client/pkg/v3 v3.5.14 + go.etcd.io/etcd/client/pkg/v3 v3.5.14-dd.1 go.uber.org/zap v1.17.0 google.golang.org/grpc v1.59.0 ) diff --git a/raft/go.mod b/raft/go.mod index 60ecbcf54ea6..545b64dc9419 100644 --- a/raft/go.mod +++ b/raft/go.mod @@ -8,7 +8,7 @@ require ( github.com/cockroachdb/datadriven v1.0.2 github.com/gogo/protobuf v1.3.2 github.com/golang/protobuf v1.5.4 - go.etcd.io/etcd/client/pkg/v3 v3.5.14 + go.etcd.io/etcd/client/pkg/v3 v3.5.14-dd.1 ) require ( diff --git a/server/go.mod b/server/go.mod index da229a142e20..6b6ece0fe354 100644 --- a/server/go.mod +++ b/server/go.mod @@ -26,12 +26,12 @@ require ( github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 go.etcd.io/bbolt v1.3.10 - go.etcd.io/etcd/api/v3 v3.5.14 - go.etcd.io/etcd/client/pkg/v3 v3.5.14 + go.etcd.io/etcd/api/v3 v3.5.14-dd.1 + go.etcd.io/etcd/client/pkg/v3 v3.5.14-dd.1 go.etcd.io/etcd/client/v2 v2.305.14 - go.etcd.io/etcd/client/v3 v3.5.14 - go.etcd.io/etcd/pkg/v3 v3.5.14 - go.etcd.io/etcd/raft/v3 v3.5.14 + go.etcd.io/etcd/client/v3 v3.5.14-dd.1 + go.etcd.io/etcd/pkg/v3 v3.5.14-dd.1 + go.etcd.io/etcd/raft/v3 v3.5.14-dd.1 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 go.opentelemetry.io/otel v1.20.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 diff --git a/tests/framework/e2e/flags.go b/tests/framework/e2e/flags.go index fdbde8922ae2..5fac1ca78584 100644 --- a/tests/framework/e2e/flags.go +++ b/tests/framework/e2e/flags.go @@ -74,6 +74,6 @@ func InitFlags() { CertPath3 = CertDir + "/server3.crt" PrivateKeyPath3 = CertDir + "/server3.key.insecure" - CertPath3 = CertDir + "/server4.crt" - PrivateKeyPath3 = CertDir + "/server4.key.insecure" + CertPath4 = CertDir + "/server4.crt" + PrivateKeyPath4 = CertDir + "/server4.key.insecure" } diff --git a/tests/go.mod b/tests/go.mod index 96c98e2752fe..679accbbbc04 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -31,14 +31,14 @@ require ( github.com/spf13/cobra v1.1.3 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.4 - go.etcd.io/etcd/api/v3 v3.5.14 - go.etcd.io/etcd/client/pkg/v3 v3.5.14 + go.etcd.io/etcd/api/v3 v3.5.14-dd.1 + go.etcd.io/etcd/client/pkg/v3 v3.5.14-dd.1 go.etcd.io/etcd/client/v2 v2.305.14 - go.etcd.io/etcd/client/v3 v3.5.14 - go.etcd.io/etcd/etcdutl/v3 v3.5.14 - go.etcd.io/etcd/pkg/v3 v3.5.14 - go.etcd.io/etcd/raft/v3 v3.5.14 - go.etcd.io/etcd/server/v3 v3.5.14 + go.etcd.io/etcd/client/v3 v3.5.14-dd.1 + go.etcd.io/etcd/etcdutl/v3 v3.5.14-dd.1 + go.etcd.io/etcd/pkg/v3 v3.5.14-dd.1 + go.etcd.io/etcd/raft/v3 v3.5.14-dd.1 + go.etcd.io/etcd/server/v3 v3.5.14-dd.1 go.etcd.io/gofail v0.1.0 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 go.opentelemetry.io/otel v1.20.0