bump etcd to latest 3.4.x release (#620)

gravitational · Apr 27, 2020 · 14cd009 · 14cd009
1 parent ef14d84
commit 14cd009
Show file tree

Hide file tree

Showing 11 changed files with 88 additions and 23 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -69,7 +69,7 @@ ignored = ["github.com/gravitational/planet/build/*"]
 
 [[override]]
   name = "github.com/etcd-io/etcd"
-  version = "3.4.3"
+  version = "=3.4.7"
 
 [[constraint]]
   name = "github.com/docker/docker"

diff --git a/Makefile b/Makefile
@@ -59,13 +59,15 @@ PLANET_GID ?= 980665
 # v3.3.11 - 5.5.x,
 # v3.3.12 - 6.3.x, 6.1.x, 5.5.x
 # v3.3.15 - 6.3.x
+# v3.3.20 - 6.3.x, 6.1.x, 5.5.x
 # v3.4.3  - 7.0.x
-ETCD_VER := v3.3.12 v3.3.15 v3.4.3
+# v3.4.7  - 7.0.x
+ETCD_VER := v3.3.12 v3.3.15 v3.4.3 v3.4.7
 # This is the version of etcd we should upgrade to (from the version list)
 # Note: When bumping the ETCD_LATEST_VERSION, please ensure that:
 #   - The version of etcd vendored as a library is the same (Gopkg.toml)
 #   - Modify build.go and run the etcd upgrade integration test (go run mage.go ci:testEtcdUpgrade)
-ETCD_LATEST_VER := v3.4.3
+ETCD_LATEST_VER := v3.4.7
 
 BUILDBOX_GO_VER ?= 1.12.9
 PLANET_BUILD_TAG ?= $(shell git describe --tags)

diff --git a/build.go b/build.go
@@ -26,6 +26,6 @@ type Test mg.Namespace
 func (Test) TestEtcdUpgrade() error {
 	// The "to" version should match what etcd is built with
 	// TODO(knisbet) integrate this variable with etcd versions set in Makefile
-	err := upgrade.TestUpgradeBetweenVersions("v3.3.3", "v3.4.3")
+	err := upgrade.TestUpgradeBetweenVersions("v3.3.3", "v3.4.7")
 	return trace.Wrap(err)
 }
diff --git a/vendor/go.etcd.io/etcd/clientv3/client.go b/vendor/go.etcd.io/etcd/clientv3/client.go
diff --git a/vendor/go.etcd.io/etcd/clientv3/ctx.go b/vendor/go.etcd.io/etcd/clientv3/ctx.go
diff --git a/vendor/go.etcd.io/etcd/clientv3/retry_interceptor.go b/vendor/go.etcd.io/etcd/clientv3/retry_interceptor.go
diff --git a/vendor/go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes/md.go b/vendor/go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes/md.go
diff --git a/vendor/go.etcd.io/etcd/lease/lessor.go b/vendor/go.etcd.io/etcd/lease/lessor.go
diff --git a/vendor/go.etcd.io/etcd/mvcc/kvstore.go b/vendor/go.etcd.io/etcd/mvcc/kvstore.go
diff --git a/vendor/go.etcd.io/etcd/version/version.go b/vendor/go.etcd.io/etcd/version/version.go