Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vendor: update etcd to 3.4.14 #14238

Merged
merged 1 commit into from
Dec 2, 2020
Merged

vendor: update etcd to 3.4.14 #14238

merged 1 commit into from
Dec 2, 2020

Conversation

aanm
Copy link
Member

@aanm aanm commented Dec 2, 2020

This version fixes etcd error "auth token invalid after
watch reconnects". etcd-io/etcd#11954

Signed-off-by: André Martins andre@cilium.io

Fix etcd's auth token invalid after watch reconnects

This version fixes etcd error "auth token invalid after
watch reconnects" etcd-io/etcd#11954.

Signed-off-by: André Martins <andre@cilium.io>
@aanm aanm added kind/bug This is a bug in the Cilium logic. release-note/bug This PR fixes an issue in a previous release of Cilium. needs-backport/1.7 labels Dec 2, 2020
@aanm aanm requested a review from a team as a code owner December 2, 2020 01:26
@aanm aanm requested a review from rolinh December 2, 2020 01:26
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.10.0 Dec 2, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.9.1 Dec 2, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.8.6 Dec 2, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.7.12 Dec 2, 2020
@aanm
Copy link
Member Author

aanm commented Dec 2, 2020

test-me-please

Copy link
Member

@joestringer joestringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚢

@@ -73,7 +73,7 @@ require (
github.com/stretchr/testify v1.6.1
github.com/vishvananda/netlink v1.1.1-0.20200603190939-5a869a71f0cb
github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df
go.etcd.io/etcd v0.5.0-alpha.5.0.20200824191128-ae9734ed278b
go.etcd.io/etcd v0.5.0-alpha.5.0.20201125193152-8a03d2e9614b
Copy link
Member

@rolinh rolinh Dec 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't it possible to go get the version rather than the git sha so we'd have go.etcd.io/etcd v3.4.14? Looking at this line, it seems we're importing a very alpha version although we're not and we can't tell which version it is at first glance.

Copy link
Member Author

@aanm aanm Dec 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rolinh no, go get will complain, I usually copy-paste the commit sha into the repository to confirm which version is it.

@aanm
Copy link
Member Author

aanm commented Dec 2, 2020

retest-gke

@aanm
Copy link
Member Author

aanm commented Dec 2, 2020

restart-gke

@aanm
Copy link
Member Author

aanm commented Dec 2, 2020

retest-gke

@aanm aanm merged commit 7b0037c into cilium:master Dec 2, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Dec 2, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.8 in 1.8.6 Dec 3, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.7 in 1.7.12 Dec 3, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot removed this from Backport pending to v1.7 in 1.7.12 Dec 4, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.9 in 1.9.1 Dec 4, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.9 in 1.9.1 Dec 4, 2020
@aanm aanm mentioned this pull request Dec 4, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.9 to Backport done to v1.9 in 1.9.1 Dec 4, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.9 to Backport done to v1.9 in 1.9.1 Dec 4, 2020
@aanm aanm mentioned this pull request Dec 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug This is a bug in the Cilium logic. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/bug This PR fixes an issue in a previous release of Cilium.
Projects
No open projects
1.8.6
Backport pending to v1.8
1.9.1
Backport done to v1.9
Development

Successfully merging this pull request may close these issues.

None yet

6 participants