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

Upgrade from go.etcd.io/etcd v3.4.14 to go.etcd.io/etcd/{api,client}/v3 v3.5.1 #9607

Merged
merged 3 commits into from Jan 10, 2022

Conversation

espadolini
Copy link
Contributor

@espadolini espadolini commented Dec 31, 2021

This lets us upgrade other modules in the future, like google.golang.org/grpc (which is probably needed for #9655) or google.golang.org/api (which we'll need for #8122).

Because of directory renamings to fit the go module convention, a small change in imports was required in lib/backend/etcdbk/etcd.go.

The only actual change listed in https://github.com/etcd-io/etcd/blob/main/CHANGELOG-3.5.md#breaking-changes relates to (*v3rpc.ClusterServer).MemberList() which we don't use, the rest is all renaming to fit in the go module convention. No changes to the client library seem to have happened between v3.4.14 and v3.4.19 (the latest 3.4 at the time of writing).

Other libraries are only bumped by minor or patch versions.

@espadolini
Copy link
Contributor Author

This would get significantly less noisy if we waited for #9545.

Copy link
Collaborator

@r0mant r0mant left a comment

Choose a reason for hiding this comment

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

@espadolini Does this actually upgrade version of etcd library we're using? If so, do you know what the changes are b/w the one we used before and this one? Just to make sure nothing regresses.

@espadolini
Copy link
Contributor Author

We upgrade the etcd client library from v3.4.14 to v3.5.1; the only actual change listed in https://github.com/etcd-io/etcd/blob/main/CHANGELOG-3.5.md#breaking-changes relates to (*v3rpc.ClusterServer).MemberList() which we don't use, the rest is all renaming to fit in the go module convention. No changes to the client library seem to have happened between v3.4.14 and v3.4.19 (the latest 3.4).

@espadolini espadolini changed the title Switch from go.etcd.io/etcd to go.etcd.io/etcd/{api,client}/v3 Upgrade from go.etcd.io/etcd v3.4.14 to go.etcd.io/etcd/{api,client}/v3 v3.5.1 Jan 7, 2022
@espadolini espadolini requested a review from r0mant January 7, 2022 13:00
@espadolini espadolini force-pushed the espadolini/update-etcd branch 2 times, most recently from 951bcb6 to dc4cfba Compare January 7, 2022 17:19
@espadolini espadolini enabled auto-merge (squash) January 7, 2022 20:33
@espadolini espadolini merged commit 5acab22 into master Jan 10, 2022
@espadolini espadolini deleted the espadolini/update-etcd branch January 10, 2022 18:44
espadolini added a commit that referenced this pull request Jan 11, 2022
* Prepare `etcdbk` to use the newer `go.etcd.io/etcd/v3` lib

* `go get go.etcd.io/etcd/api/v3 go.etcd.io/etcd/client/v3` [v8]

* Fix direct/indirect split in go.mod
russjones added a commit that referenced this pull request Jan 15, 2022
TestTwoClustersTunnel has legitimately been failing for many months.
However, we've been re-running integration tests until it passes.

On master and branch/v8 we've fixed the issue by upgrading etcd and
grpc dependency.

#9656
#9607

Ideally we'd fix TestTwoClustersTunnel on branch/6.2 and branch/v7 by
updating etcd and grpc, but as these branches are meant to be fairly
stable at this point, and the risk of unintended consequences by
updating etcd and grpc feels too high.
russjones added a commit that referenced this pull request Jan 19, 2022
TestTwoClustersTunnel has legitimately been failing for many months.
However, we've been re-running integration tests until it passes.

On master and branch/v8 we've fixed the issue by upgrading etcd and
grpc dependency.

#9656
#9607

Ideally we'd fix TestTwoClustersTunnel on branch/6.2 and branch/v7 by
updating etcd and grpc, but as these branches are meant to be fairly
stable at this point, and the risk of unintended consequences by
updating etcd and grpc feels too high.
@webvictim webvictim mentioned this pull request Mar 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants