diff --git a/go.mod b/go.mod index 8ea8890dfa..8a30076ed9 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ replace ( github.com/matryer/moq => github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009 github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.0-rc92 github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6 - go.etcd.io/etcd => github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201204203317-251ee41536d8 + go.etcd.io/etcd => github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea golang.org/x/crypto => golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 golang.org/x/net => golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 golang.org/x/sys => golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456 diff --git a/go.sum b/go.sum index 542af462d0..fb7c2353cf 100644 --- a/go.sum +++ b/go.sum @@ -472,8 +472,8 @@ github.com/k3s-io/cri v1.4.0-k3s.2 h1:HiJLH0P7k6sSJwbzjPwIN0CeY0iA6bKlb7OyThMiaE github.com/k3s-io/cri v1.4.0-k3s.2/go.mod h1:fGPUUHMKQik/vIegSe05DtX/m4miovdtvVLqRUFAkK0= github.com/k3s-io/cri-tools v1.19.0-k3s1 h1:FQ1iURavoP3rE/GqND/f3aIL1X59IpFQCRnDhiwzcZ8= github.com/k3s-io/cri-tools v1.19.0-k3s1/go.mod h1:bitvtZRi5F7t505Yw3zPzp22LOao1lqJKHfx6x0hnpw= -github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201204203317-251ee41536d8 h1:S+MCp8UM5sS1bpxedfr3Qb907ig0dF1bARZ+UqeM4vk= -github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201204203317-251ee41536d8/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= +github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea h1:7cwby0GoNAi8IsVrT0q+JfQpB6V76ZaEGhj6qts/mvU= +github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= github.com/k3s-io/flannel v0.12.0-k3s2 h1:KEfj4fe+P0qINcYZxo5/C0cga2XBEfeV4nhKrUGDyCg= github.com/k3s-io/flannel v0.12.0-k3s2/go.mod h1:2tCkIFWhim43MkRsOcPOxY8/Bcpai9uZLJaywN7ciNg= github.com/k3s-io/go-powershell v0.0.0-20200701182037-6845e6fcfa79 h1:9naOL3iAREsJh9mbf9C6Qqu9xuFv7/jIGBFCWvZMg4E= diff --git a/vendor/go.etcd.io/etcd/etcdserver/api/membership/cluster.go b/vendor/go.etcd.io/etcd/etcdserver/api/membership/cluster.go index d1cf220dd6..369a5f4c08 100644 --- a/vendor/go.etcd.io/etcd/etcdserver/api/membership/cluster.go +++ b/vendor/go.etcd.io/etcd/etcdserver/api/membership/cluster.go @@ -805,14 +805,15 @@ func (c *RaftCluster) IsLocalMemberLearner() bool { localMember, ok := c.members[c.localID] if !ok { if c.lg != nil { - c.lg.Panic( + c.lg.Error( "failed to find local ID in cluster members", zap.String("cluster-id", c.cid.String()), zap.String("local-member-id", c.localID.String()), ) } else { - plog.Panicf("failed to find local ID %s in cluster %s", c.localID.String(), c.cid.String()) + plog.Errorf("failed to find local ID %s in cluster %s", c.localID.String(), c.cid.String()) } + return false } return localMember.IsLearner } diff --git a/vendor/go.etcd.io/etcd/etcdserver/errors.go b/vendor/go.etcd.io/etcd/etcdserver/errors.go index c9b2679fd6..73e89014d5 100644 --- a/vendor/go.etcd.io/etcd/etcdserver/errors.go +++ b/vendor/go.etcd.io/etcd/etcdserver/errors.go @@ -39,7 +39,7 @@ var ( ErrKeyNotFound = errors.New("etcdserver: key not found") ErrCorrupt = errors.New("etcdserver: corrupt cluster") ErrBadLeaderTransferee = errors.New("etcdserver: bad leader transferee") - ErrMemberRemoved = errors.New("etcdserver: the member has been permanently removed from the cluster") + ErrMemberRemoved = errors.New("the member has been permanently removed from the cluster") ) type DiscoveryError struct { diff --git a/vendor/modules.txt b/vendor/modules.txt index 676da256c7..df0fcf8756 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1007,7 +1007,7 @@ github.com/willf/bitset github.com/xiang90/probing # go.etcd.io/bbolt v1.3.5 go.etcd.io/bbolt -# go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5 => github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201204203317-251ee41536d8 +# go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5 => github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea ## explicit go.etcd.io/etcd/auth go.etcd.io/etcd/auth/authpb @@ -2949,7 +2949,7 @@ vbom.ml/util/sortorder # github.com/matryer/moq => github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009 # github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.0-rc92 # github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6 -# go.etcd.io/etcd => github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201204203317-251ee41536d8 +# go.etcd.io/etcd => github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea # golang.org/x/crypto => golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 # golang.org/x/net => golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 # golang.org/x/sys => golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456