etcd: Bump to new 3.4.x version

This moves to the newest etcd release, and also updates the imports to
the new go.etcd.io path. I think this is a bit of a pain, but might as
well get it done.
This commit is contained in:
James Shubin
2019-12-17 02:38:55 -05:00
parent fdc459ec5b
commit e73007c398
27 changed files with 58 additions and 58 deletions

View File

@@ -27,8 +27,8 @@ import (
"github.com/purpleidea/mgmt/util"
"github.com/purpleidea/mgmt/util/errwrap"
"github.com/coreos/etcd/embed"
etcdtypes "github.com/coreos/etcd/pkg/types"
"go.etcd.io/etcd/embed"
etcdtypes "go.etcd.io/etcd/pkg/types"
)
const (
@@ -143,7 +143,7 @@ func (obj *EmbdEtcd) runServer(newCluster bool, peerURLsMap etcdtypes.URLsMap) (
cfg.LCUrls = obj.ClientURLs
cfg.APUrls = aPUrls
cfg.ACUrls = aCUrls
cfg.StrictReconfigCheck = false // XXX: workaround https://github.com/coreos/etcd/issues/6305
cfg.StrictReconfigCheck = false // XXX: workaround https://github.com/etcd-io/etcd/issues/6305
cfg.MaxTxnOps = DefaultMaxTxnOps
cfg.InitialCluster = initialPeerURLsMap.String() // including myself!