Skip to content

Commit

Permalink
Merge pull request #57480 from jpbetz/etcd-client-3.2.12
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Version bump to etcd v3.2.13, grpc v1.7.5

Reapply kubernetes/kubernetes#57160 but with etcd 3.2.13, which includes etcd-io/etcd#9047 to fix kubernetes/kubernetes#51099.

We need to scalability test this PR before merging it since the previous attempt to version bump to grpc v1.7+ resulted in a scalability test failure after the PR was merged to master, and we don't want to repeat that. No, no we don't.

Thanks @gyuho for fixing the etcd grpc issue and releasing etcd-3.2.13 on short notice.

**Release note**:

```release-note
Upgrade to etcd client 3.2.13 and grpc 1.7.5 to improve HA etcd cluster stability.
```

Kubernetes-commit: 531b97ba93e46cde4b1fcd3f170224dbecbe2c1d
  • Loading branch information
k8s-publishing-bot committed Jan 7, 2018
2 parents 6b076bf + a461d19 commit 6d5635c
Show file tree
Hide file tree
Showing 181 changed files with 14,122 additions and 13,155 deletions.
394 changes: 197 additions & 197 deletions Godeps/Godeps.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/github.com/coreos/etcd/auth/authpb/auth.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

52 changes: 43 additions & 9 deletions vendor/github.com/coreos/etcd/client/client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions vendor/github.com/coreos/etcd/client/discover.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

65 changes: 0 additions & 65 deletions vendor/github.com/coreos/etcd/client/srv.go

This file was deleted.

10 changes: 7 additions & 3 deletions vendor/github.com/coreos/etcd/clientv3/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

63 changes: 33 additions & 30 deletions vendor/github.com/coreos/etcd/clientv3/auth.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6d5635c

Please sign in to comment.