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 etcd to 3.4.7 #2090

Merged
merged 6 commits into from
Apr 30, 2020
Merged

Upgrade etcd to 3.4.7 #2090

merged 6 commits into from
Apr 30, 2020

Conversation

gdbelvin
Copy link
Contributor

@gdbelvin gdbelvin commented Apr 24, 2020

Resolves CVE-2018-1098 CVE-2018-1099. etcd-io/etcd#10480

The version number go.etcd.io/etcd v0.0.0-20200401174654-e694b7bb0875 was calculated with the following script, as suggested in etcd-io/etcd#11154

git clone --branch v3.4.7 https://github.com/etcd-io/etcd.git
cd etcd
echo -n v0.0.0-
TZ=UTC git --no-pager show \
  --quiet \
  --abbrev=12 \
  --date='format-local:%Y%m%d%H%M%S' \
  --format="%cd-%h"

@gdbelvin gdbelvin requested a review from a team as a code owner April 24, 2020 19:58
@gdbelvin gdbelvin requested a review from taknira April 24, 2020 19:58
@gdbelvin gdbelvin changed the title Resolves CVE-2018-1098 CVE-2018-1099. https://github.com/etcd-io/etcd/issues/10480 Upgrade etcd to 3.4.7 Apr 24, 2020
@codecov
Copy link

codecov bot commented Apr 24, 2020

Codecov Report

Merging #2090 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2090   +/-   ##
=======================================
  Coverage   58.92%   58.92%           
=======================================
  Files         115      115           
  Lines        9778     9778           
=======================================
  Hits         5762     5762           
  Misses       3513     3513           
  Partials      503      503           
Impacted Files Coverage Δ
quota/etcd/etcdqm/etcdqm.go 92.59% <ø> (ø)
quota/etcd/quotaapi/quota_server.go 93.79% <ø> (ø)
quota/etcd/storage/quota_storage.go 84.15% <ø> (ø)
util/election2/etcd/election.go 75.00% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 125ecc0...496963f. Read the comment docs.

```
git clone --branch v3.4.7 https://github.com/etcd-io/etcd.git
cd etcd
echo -n v0.0.0-
TZ=UTC git --no-pager show \
  --quiet \
  --abbrev=12 \
  --date='format-local:%Y%m%d%H%M%S' \
  --format="%cd-%h"
```
Fix unsafe pointer conversions caught by Go 1.14 checkptr
bump travis 2
Copy link
Contributor

@NatalieDoduc NatalieDoduc left a comment

Choose a reason for hiding this comment

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

Could you also add to the PR description the fact that you've removed dependencies on coreos/? Thanks for doing that as well, BTW!

@gdbelvin gdbelvin merged commit 6abb04d into google:master Apr 30, 2020
@gdbelvin gdbelvin deleted the etcd branch April 30, 2020 13:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants