version: 3.5.0-beta.3

Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
Merge pull request #12998 from hexfusion/cp-12997
2021-05-18 09:44:35 -04:00 · 2021-05-18 08:20:41 -04:00 · 2021-05-18 07:57:27 -04:00
12 changed files with 45 additions and 44 deletions
--- 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.0-beta.2"
+	Version           = "3.5.0-beta.3"
 	APIVersion        = "unknown"

 	// Git SHA Value will be set during build
--- a/client/v2/go.mod
+++ b/client/v2/go.mod
@ -5,8 +5,8 @@ go 1.16
 require (
 	github.com/json-iterator/go v1.1.10
 	github.com/modern-go/reflect2 v1.0.1
-	go.etcd.io/etcd/api/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/api/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.3
 )

 replace (
--- a/client/v3/go.mod
+++ b/client/v3/go.mod
@ -6,8 +6,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.5.1
-	go.etcd.io/etcd/api/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/api/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.3
 	go.uber.org/zap v1.16.1-0.20210329175301-c23abee72d19
 	google.golang.org/grpc v1.37.0
 	sigs.k8s.io/yaml v1.2.0
--- a/etcdctl/go.mod
+++ b/etcdctl/go.mod
@ -9,12 +9,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.0-beta.2
-	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/client/v2 v2.305.0-beta.2
-	go.etcd.io/etcd/client/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/etcdutl/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/pkg/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/api/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/client/v2 v2.305.0-beta.3
+	go.etcd.io/etcd/client/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/etcdutl/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/pkg/v3 v3.5.0-beta.3
 	go.uber.org/zap v1.16.1-0.20210329175301-c23abee72d19
 	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
 	google.golang.org/grpc v1.37.0
--- a/etcdutl/go.mod
+++ b/etcdutl/go.mod
@ -25,11 +25,11 @@ require (
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/spf13/cobra v1.1.3
 	go.etcd.io/bbolt v1.3.6-0.20210426205525-9c92be978ae0
-	go.etcd.io/etcd/api/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/client/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/pkg/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/raft/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/server/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/api/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/client/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/pkg/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/raft/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/server/v3 v3.5.0-beta.3
 	go.uber.org/zap v1.16.1-0.20210329175301-c23abee72d19
 )
--- a/go.mod
+++ b/go.mod
@ -20,16 +20,16 @@ require (
 	github.com/dustin/go-humanize v1.0.0
 	github.com/spf13/cobra v1.1.3
 	go.etcd.io/bbolt v1.3.6-0.20210426205525-9c92be978ae0
-	go.etcd.io/etcd/api/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/client/v2 v2.305.0-beta.2
-	go.etcd.io/etcd/client/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/etcdctl/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/etcdutl/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/pkg/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/raft/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/server/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/tests/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/api/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/client/v2 v2.305.0-beta.3
+	go.etcd.io/etcd/client/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/etcdctl/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/etcdutl/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/pkg/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/raft/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/server/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/tests/v3 v3.5.0-beta.3
 	go.uber.org/zap v1.16.1-0.20210329175301-c23abee72d19
 	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
 	google.golang.org/grpc v1.37.0
--- a/pkg/go.mod
+++ b/pkg/go.mod
@ -9,7 +9,7 @@ require (
 	github.com/spf13/cobra v1.1.3
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
-	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.3
 	go.uber.org/zap v1.16.1-0.20210329175301-c23abee72d19
 	google.golang.org/grpc v1.37.0
 )
--- a/raft/go.mod
+++ b/raft/go.mod
@ -8,7 +8,7 @@ require (
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang/protobuf v1.5.2
 	github.com/pkg/errors v0.9.1 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.3
 )

 // Bad imports are sometimes causing attempts to pull that code.
--- a/scripts/build-docker
+++ b/scripts/build-docker
@ -30,7 +30,7 @@ IMAGEDIR=${BUILDDIR}/image-docker

 mkdir -p "${IMAGEDIR}"/var/etcd
 mkdir -p "${IMAGEDIR}"/var/lib/etcd
-cp "${BINARYDIR}"/etcd "${BINARYDIR}"/etcdctl "${IMAGEDIR}"
+cp "${BINARYDIR}"/etcd "${BINARYDIR}"/etcdctl "${BINARYDIR}"/etcdutl "${IMAGEDIR}"

 cat ./"${DOCKERFILE}" > "${IMAGEDIR}"/Dockerfile

--- a/scripts/release
+++ b/scripts/release
@ -193,6 +193,7 @@ main() {
  # Sanity checks.
  "./release/etcd-${RELEASE_VERSION}-$(go env GOOS)-amd64/etcd" --version | grep -q "etcd Version: ${VERSION}" || true
  "./release/etcd-${RELEASE_VERSION}-$(go env GOOS)-amd64/etcdctl" version | grep -q "etcdctl version: ${VERSION}" || true
+  "./release/etcd-${RELEASE_VERSION}-$(go env GOOS)-amd64/etcdutl" version | grep -q "etcdutl version: ${VERSION}" || true

  # Generate SHA256SUMS
  log_callout "Generating sha256sums of release artifacts."
--- a/server/go.mod
+++ b/server/go.mod
@ -27,12 +27,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.6-0.20210426205525-9c92be978ae0
-	go.etcd.io/etcd/api/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/client/v2 v2.305.0-beta.2
-	go.etcd.io/etcd/client/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/pkg/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/raft/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/api/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/client/v2 v2.305.0-beta.3
+	go.etcd.io/etcd/client/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/pkg/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/raft/v3 v3.5.0-beta.3
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0
 	go.opentelemetry.io/otel v0.20.0
 	go.opentelemetry.io/otel/exporters/otlp v0.20.0
--- a/tests/go.mod
+++ b/tests/go.mod
@ -28,14 +28,14 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
 	go.etcd.io/bbolt v1.3.6-0.20210426205525-9c92be978ae0
-	go.etcd.io/etcd/api/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/client/v2 v2.305.0-beta.2
-	go.etcd.io/etcd/client/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/etcdutl/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/pkg/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/raft/v3 v3.5.0-beta.2
-	go.etcd.io/etcd/server/v3 v3.5.0-beta.2
+	go.etcd.io/etcd/api/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/client/v2 v2.305.0-beta.3
+	go.etcd.io/etcd/client/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/etcdutl/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/pkg/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/raft/v3 v3.5.0-beta.3
+	go.etcd.io/etcd/server/v3 v3.5.0-beta.3
 	go.uber.org/zap v1.16.1-0.20210329175301-c23abee72d19
 	golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
 	golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
Author	SHA1	Message	Date
Sam Batschelet	379c361bc6	version: 3.5.0-beta.3 Signed-off-by: Sam Batschelet <sbatsche@redhat.com>	2021-05-18 09:44:35 -04:00
Sam Batschelet	163d9fd6f4	Merge pull request #12998 from hexfusion/cp-12997 Manual cherry pick of #12997	2021-05-18 08:20:41 -04:00
Sam Batschelet	d06c97209c	scripts: add missing etcdutl to release pipeline Signed-off-by: Sam Batschelet <sbatsche@redhat.com>	2021-05-18 07:57:27 -04:00