Update libnetwork with fixes for duplicate IP addresses#36589
Update libnetwork with fixes for duplicate IP addresses#36589tiborvass merged 1 commit intomoby:masterfrom
Conversation
There was a problem hiding this comment.
updating userland-proxy accordingly, but it was not in sync with the vendor moby/libnetwork@ed2130d...2112cac (don't think this brings in any changes in the proxy)
There was a problem hiding this comment.
umph; this needs to be fixed in libnetwork: github.com/golang/sync is not the canonical import path. This is the same package as golang.org/x/sync
vndr github.com/golang/sync
2018/03/14 11:54:37 Collecting initial packages
2018/03/14 11:55:00 Download dependencies
2018/03/14 11:55:00 Failed to parse config: invalid config format: // FIXME this should be golang.org/x/sync, which is already vendored above
|
made this WIP, pending moby/libnetwork#2111 to be merged, after which this needs to be updated. |
Codecov Report
@@ Coverage Diff @@
## master #36589 +/- ##
=========================================
Coverage ? 34.73%
=========================================
Files ? 612
Lines ? 45410
Branches ? 0
=========================================
Hits ? 15772
Misses ? 27580
Partials ? 2058 |
|
Actually; it's only used in a test, which is not vendored in, so we should be ok here |
|
ping @fcrisciani @ddebroy @vdemeester PTAL |
This updates libnetwork to 8892d7537c67232591f1f3af60587e3e77e61d41 to bring in IPAM fixes for duplicate IP addresses. - IPAM tests (libnetwork PR 2104) (no changes in vendored files) - Fix for Duplicate IP issues (libnetwork PR 2105) Also bump golang/x/sync to match libnetwork (no code-changes, other than the README being updated) Signed-off-by: Sebastiaan van Stijn <[email protected]>
6b7f348 to
55e0fe2
Compare
|
CI failed on some flaky tests, so I bumped the sha to include moby/libnetwork#2111 and retrigger CI |
|
Tests still flaky on the same problem; |
|
something odd on the s390x. Should not be related to this PR though https://jenkins.dockerproject.org/job/Docker-PRs-s390x/8927/console; /cc @tophj-ibm |
|
LGTM |
This updates libnetwork to moby/libnetwork@8892d75 to bring in IPAM fixes for duplicate IP addresses.
Full diff: https://github.com/docker/libnetwork/compare/3aca383eb555510f3f17696f9505f7bfbd25f0e5... 8892d7537c67232591f1f3af60587e3e77e61d41
Signed-off-by: Sebastiaan van Stijn [email protected]
- What I did
- How I did it
- How to verify it
- Description for the changelog