Skip to content

bump(*): update etcd to 3.2.16 and grpc to 1.7.5 #18660

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.

Sign up for GitHub

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

Closed
wants to merge 3 commits into from
Closed

bump(*): update etcd to 3.2.16 and grpc to 1.7.5 #18660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7b426f
bump(*): update etcd to 3.2.16 and grpc to 1.7.5
mfojtik Feb 19, 2018
92c177a
UPSTREAM: 57480: Fix build and test errors from etcd 3.2.13 upgrade
mfojtik Feb 20, 2018
174022f
WIP: increase unit test timeout
mfojtik Feb 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
288 changes: 144 additions & 144 deletions Godeps/Godeps.json
View file
Open in desktop

Large diffs are not rendered by default.

39 changes: 23 additions & 16 deletions glide.lock
View file
Open in desktop

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

6 changes: 5 additions & 1 deletion glide.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,11 @@ import:
version: ded73eae5db7e7a0ef6f55aace87a2873c5d2b74
# master
- package: github.com/coreos/etcd
version: v3.2.8
version: v3.2.16
- package: google.golang.org/grpc
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this is pinning the version of grpc to the version used by etcd 3.2.16

Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't that be discovered by glide?

Copy link
Contributor Author

@mfojtik mfojtik Feb 19, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

surprisingly not... when I just bumped etcd, these were unchanged (on disk).

Copy link
Contributor Author

@mfojtik mfojtik Feb 19, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

What is strange is that the HEAD version of grpc is 1.3.0, but the etcd 3.2.8 version of grpc is 1.2.1 (from https://github.com/coreos/etcd/blob/v3.2.8/glide.yaml#L99). That means that in HEAD we are ahead of what our level of etcd was using.

Copy link
Contributor

Choose a reason for hiding this comment

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

when I just bumped etcd, these were unchanged (on disk).

did you unpin these first? if not, pinned means pinned.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@liggitt i don't see how they are currently pinned, we don't mention them in glide.yaml

version: v1.7.5
- package: github.com/grpc-ecosystem/grpc-gateway
version: v1.3.0
# cli
- package: github.com/gonum/blas
version: 37e82626499e1df7c54aeaba0959fd6e7e8dc1e4
Expand Down
2 changes: 1 addition & 1 deletion hack/test-go.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ os::cleanup::tmpdir

# Internalize environment variables we consume and default if they're not set
dry_run="${DRY_RUN:-}"
test_timeout="${TIMEOUT:-120s}"
test_timeout="${TIMEOUT:-600s}"
detect_races="${DETECT_RACES:-true}"
coverage_output_dir="${COVERAGE_OUTPUT_DIR:-}"
coverage_spec="${COVERAGE_SPEC:--cover -covermode atomic}"
Expand Down
18 changes: 0 additions & 18 deletions vendor/github.com/boltdb/bolt/Makefile
View file
Open in desktop

This file was deleted.

185 changes: 0 additions & 185 deletions vendor/github.com/boltdb/bolt/cmd/bolt/main_test.go
View file
Open in desktop

This file was deleted.

Loading