Skip to content

K
k3s
Unverified Commit 989c9369 authored by Hussein Galal's avatar Hussein Galal Committed by GitHub
Browse files
Options

update etcd to fix the panic for etcd tombstone issue (#2658)

* update etcd Signed-off-by: 's avatargalal-hussein <hussein.galal.ahmed.11@gmail.com> * go mod tidy Signed-off-by: 's avatargalal-hussein <hussein.galal.ahmed.11@gmail.com>
parent cd5591cc
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 8 deletions
go.mod
View file @ 989c9369
...@@ -25,7 +25,7 @@ replace ( ...@@ -25,7 +25,7 @@ replace (
github.com/matryer/moq => github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009 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/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 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/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/net => golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7
golang.org/x/sys => golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456 golang.org/x/sys => golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456
......
go.sum
View file @ 989c9369
...@@ -472,8 +472,8 @@ github.com/k3s-io/cri v1.4.0-k3s.2 h1:HiJLH0P7k6sSJwbzjPwIN0CeY0iA6bKlb7OyThMiaE ...@@ -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 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 h1:FQ1iURavoP3rE/GqND/f3aIL1X59IpFQCRnDhiwzcZ8=
github.com/k3s-io/cri-tools v1.19.0-k3s1/go.mod h1:bitvtZRi5F7t505Yw3zPzp22LOao1lqJKHfx6x0hnpw= 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.20201208200253-50621aee4aea h1:7cwby0GoNAi8IsVrT0q+JfQpB6V76ZaEGhj6qts/mvU=
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/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 h1:KEfj4fe+P0qINcYZxo5/C0cga2XBEfeV4nhKrUGDyCg=
github.com/k3s-io/flannel v0.12.0-k3s2/go.mod h1:2tCkIFWhim43MkRsOcPOxY8/Bcpai9uZLJaywN7ciNg= 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= github.com/k3s-io/go-powershell v0.0.0-20200701182037-6845e6fcfa79 h1:9naOL3iAREsJh9mbf9C6Qqu9xuFv7/jIGBFCWvZMg4E=
......
vendor/go.etcd.io/etcd/etcdserver/api/membership/cluster.go
View file @ 989c9369
...@@ -805,14 +805,15 @@ func (c *RaftCluster) IsLocalMemberLearner() bool { ...@@ -805,14 +805,15 @@ func (c *RaftCluster) IsLocalMemberLearner() bool {
localMember, ok := c.members[c.localID] localMember, ok := c.members[c.localID]
if !ok { if !ok {
if c.lg != nil { if c.lg != nil {
c.lg.Panic( c.lg.Error(
"failed to find local ID in cluster members", "failed to find local ID in cluster members",
zap.String("cluster-id", c.cid.String()), zap.String("cluster-id", c.cid.String()),
zap.String("local-member-id", c.localID.String()), zap.String("local-member-id", c.localID.String()),
) )
} else { } 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 return localMember.IsLearner
} }
......
vendor/go.etcd.io/etcd/etcdserver/errors.go
View file @ 989c9369
...@@ -39,7 +39,7 @@ var ( ...@@ -39,7 +39,7 @@ var (
ErrKeyNotFound = errors.New("etcdserver: key not found") ErrKeyNotFound = errors.New("etcdserver: key not found")
ErrCorrupt = errors.New("etcdserver: corrupt cluster") ErrCorrupt = errors.New("etcdserver: corrupt cluster")
ErrBadLeaderTransferee = errors.New("etcdserver: bad leader transferee") 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 { type DiscoveryError struct {
......
vendor/modules.txt
View file @ 989c9369
...@@ -1007,7 +1007,7 @@ github.com/willf/bitset ...@@ -1007,7 +1007,7 @@ github.com/willf/bitset
github.com/xiang90/probing github.com/xiang90/probing
# go.etcd.io/bbolt v1.3.5 # go.etcd.io/bbolt v1.3.5
go.etcd.io/bbolt 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 ## explicit
go.etcd.io/etcd/auth go.etcd.io/etcd/auth
go.etcd.io/etcd/auth/authpb go.etcd.io/etcd/auth/authpb
...@@ -2949,7 +2949,7 @@ vbom.ml/util/sortorder ...@@ -2949,7 +2949,7 @@ vbom.ml/util/sortorder
# github.com/matryer/moq => github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009 # 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/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 # 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/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/net => golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7
# golang.org/x/sys => golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456 # golang.org/x/sys => golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment