Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

[19.03 backport] bump libnetwork to 92d1fbe1eb0883cf11d283cea8e658275146411d #330

Merged

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Aug 22, 2019

relates to FIELD-211
relates to ENGCORE-960
relates to ENGCORE-692

(moby/libnetwork#2415 / moby/libnetwork#2415)
backports of:

moby#39054 bump libnetwork. vishvananda/netlink 1.0, vishvananda/netns

full diffs:

notable changes in libnetwork:

moby#39423 Update modules to support riscv64

Updating projects using libraries that were recently updated to support Risc-V architecture.

Go upstream work is tracked on: golang/go#27532

Risc-V software support tracker on https://github.com/carlosedp/riscv-bringup

moby#39633 bump libnetwork to 09cdcc8c0eab3946c2d70e8f6225b05baf1e90d1

full diff: moby/libnetwork@83d30db...09cdcc8

changes included:

moby#39855 bump libnetwork and dependencies to 92d1fbe1eb0883cf11d283cea8e658275146411d

bump libnetwork to 92d1fbe1eb0883cf11d283cea8e658275146411d

full diff: moby/libnetwork@09cdcc8...92d1fbe

relevant changes included (omitting some changes that were added and reverted in this bump):

bump hashicorp/go-multierror v1.0.0, add errwrap v1.0.0

full diff: hashicorp/go-multierror@fcdddc3...v1.0.0

bump hashicorp/go-sockaddr v1.0.2

full diff: hashicorp/go-sockaddr@6d291a9...v1.0.2

Relevant changes:

@thaJeztah thaJeztah added this to the 19.03.2 milestone Aug 22, 2019
@thaJeztah
Copy link
Member Author

ping @arkodg @selansen @andrewhsu PTAL if all of these are ok for backporting (looks like they're all fixes, but could use some eyes to double-check, also to see if there's risk involved)

@thaJeztah
Copy link
Member Author

@selansen I see there's an open issue for adding an integration test for this: moby#39511

@arkodg
Copy link

arkodg commented Aug 22, 2019

@thaJeztah we probably need to merge moby/libnetwork#2433 in libnetwork first, which fixes a regression caused by moby/libnetwork#2416

@thaJeztah thaJeztah changed the title [19.03 backport] bump libnetwork to 09cdcc8c0eab3946c2d70e8f6225b05baf1e90d1 [WIP][19.03 backport] bump libnetwork to 09cdcc8c0eab3946c2d70e8f6225b05baf1e90d1 Aug 22, 2019
@thaJeztah
Copy link
Member Author

ok; marking this as WIP

@thaJeztah
Copy link
Member Author

thaJeztah commented Sep 3, 2019

opened moby#39855 to update libnetwork with the fix

edit: cherry-picked changes from that PR

@thaJeztah thaJeztah force-pushed the 19.03_backport_bump_libnetwork branch from 8d00e6d to 34b9fd2 Compare September 3, 2019 10:24
@thaJeztah thaJeztah changed the title [WIP][19.03 backport] bump libnetwork to 09cdcc8c0eab3946c2d70e8f6225b05baf1e90d1 [19.03 backport] bump libnetwork to 92d1fbe1eb0883cf11d283cea8e658275146411d Sep 3, 2019
@thaJeztah thaJeztah force-pushed the 19.03_backport_bump_libnetwork branch 2 times, most recently from 744c6e5 to 751e980 Compare September 12, 2019 08:22
@thaJeztah thaJeztah force-pushed the 19.03_backport_bump_libnetwork branch from 751e980 to 9d1234f Compare September 16, 2019 11:42
@trapier
Copy link

trapier commented Sep 16, 2019

What 19.03 version this will be in. Given this hasn't yet merged, I assume it's going to miss the forthcoming patch?

thaJeztah and others added 6 commits September 16, 2019 18:34
full diffs:

- moby/libnetwork@fc5a7d9...62a13ae
- vishvananda/netlink@b2de5d1...v1.0.0
- vishvananda/netns@604eaf1...13995c7

notable changes in libnetwork:

- moby/libnetwork#2366 Bump vishvananda/netlink to 1.0.0
- moby/libnetwork#2339 controller: Check if IPTables is enabled for arrangeUserFilterRule
  - addresses moby/libnetwork#2158 dockerd when run with --iptables=false modifies iptables by adding DOCKER-USER
  - addresses moby#35777 With iptables=false dockerd still creates DOCKER-USER chain and rules
  - addresses docker/for-linux#136 dockerd --iptables=false adds DOCKER-USER chain and modify FORWARD chain anyway
- moby/libnetwork#2394 Make DNS records and queries case-insensitive
  - addresses moby#28689 Embedded DNS is case-sensitive
  - addresses moby#21169 hostnames with new networking are case-sensitive

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 344b093)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: CarlosEDP <[email protected]>
(cherry picked from commit 9eaab04)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
full diff: moby/libnetwork@83d30db...09cdcc8

changes included:

- moby/libnetwork#2416 Fix hardcoded AF_INET for IPv6 address handling
- moby/libnetwork#2411 Macvlan network handles netlabel.Internal wrong
  - fixes moby/libnetwork#2410 Macvlan network handles netlabel.Internal wrong
- moby/libnetwork#2414 Allow network with --config-from to be --internal
  - fixes moby/libnetwork#2413 Network with --config-from does not honor --internal
- moby/libnetwork#2351 Use fewer modprobes
  - relates to moby#38930 Use fewer modprobes
- moby/libnetwork#2415 Support dockerd and system restarts for ipvlan and macvlan networks
  - carry of moby/libnetwork#2295 phantom ip/mac vlan network after a powercycle
  - fixes moby/libnetwork#1743 Phantom docker network

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 6f234db)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
full diff: moby/libnetwork@09cdcc8...92d1fbe

relevant changes included (omitting some changes that were added _and_ reverted in this bump):

- moby/libnetwork#2433 Fix parseIP error when parseIP before get AddressFamily
  - fixes moby/libnetwork#2431 parseIP Error ip=[172 17 0 2 0 0 0 0 0 0 0 0 0 0 0 0]
  - moby/libnetwork#2289
  - this was a regression introduced in moby/libnetwork#2416 Fix hardcoded AF_INET for IPv6 address handling
- moby/libnetwork#2440 Bump hashicorp go-sockaddr v1.0.2, go-multierror v1.0.0

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit bab58c1)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
full diff: hashicorp/go-multierror@fcdddc3...v1.0.0

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 720b66e)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
full diff: hashicorp/go-sockaddr@6d291a9...v1.0.2

Relevant changes:
  - hashicorp/go-sockaddr#25 Add android os
  - hashicorp/go-sockaddr#28 Add go.mod

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 492945c)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the 19.03_backport_bump_libnetwork branch from 9d1234f to 5196dc6 Compare September 16, 2019 16:34
@thaJeztah
Copy link
Member Author

perhaps still possible if I get this reviewed

@thaJeztah
Copy link
Member Author

@kolyshkin @arkodg @andrewhsu PTAL

Copy link

@selansen selansen left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link

@arkodg arkodg left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link

@arkodg arkodg left a comment

Choose a reason for hiding this comment

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

LGTM

@andrewhsu andrewhsu merged commit c416072 into docker-archive:19.03 Sep 16, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants