Skip to content

[20.10 backport] vendor: docker/libnetwork b3507428be5b458cb0e2b4086b13531fb0706e46#42205

Merged
tiborvass merged 2 commits into
moby:20.10from
thaJeztah:20.10_backport_bump_libnetwork
Apr 1, 2021
Merged

[20.10 backport] vendor: docker/libnetwork b3507428be5b458cb0e2b4086b13531fb0706e46#42205
tiborvass merged 2 commits into
moby:20.10from
thaJeztah:20.10_backport_bump_libnetwork

Conversation

@thaJeztah

@thaJeztah thaJeztah commented Mar 25, 2021

Copy link
Copy Markdown
Member

backport of #41908

also somewhat related to #28589, which discusses the "implicit" binding of IPv6

depends on:

full diff: moby/libnetwork@fa125a3...b350742

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@thaJeztah
fix assertPortList normalizing being too strict
d26ed2c 
The normalizing was updated with the output of the "docker port" command
in mind, but we're normalizing the "expected" output, which is passed
without the "->" in front of the mapping, causing some tests to fail;

    === RUN   TestDockerSuite/TestPortHostBinding
        --- FAIL: TestDockerSuite/TestPortHostBinding (1.21s)
            docker_cli_port_test.go:324: assertion failed: error is not nil: |:::9876!=[::]:9876|
    === RUN   TestDockerSuite/TestPortList
        --- FAIL: TestDockerSuite/TestPortList (0.96s)
            docker_cli_port_test.go:25: assertion failed: error is not nil: |:::9876!=[::]:9876|

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit c8599a6)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: docker/libnetwork b3507428be5b458cb0e2b4086b13531fb0706e46
8847005 
full diff: moby/libnetwork@fa125a3...b350742

- fixed IPv6 iptables rules for enabled firewalld (libnetwork#2609)
    - fixes "Docker uses 'iptables' instead of 'ip6tables' for IPv6 NAT rule, crashes"
- Fix regression in docker-proxy
    - introduced in "Fix IPv6 Port Forwarding for the Bridge Driver" (libnetwork#2604)
    - fixes/addresses: "IPv4 and IPv6 addresses are not bound by default anymore" (libnetwork#2607)
    - fixes/addresses "IPv6 is no longer proxied by default anymore" (moby#41858)
- Use hostIP to decide on Portmapper version
    - fixes docker-proxy not being stopped correctly

Port mapping of containers now contain separatet mappings for IPv4 and IPv6 addresses, when
listening on "any" IP address. Various tests had to be updated to take multiple mappings into
account.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 0450728)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah added this to the 20.10.6 milestone Mar 25, 2021
@thaJeztah thaJeztah mentioned this pull request Mar 25, 2021
Merged
5 tasks
@thaJeztah
thaJeztah marked this pull request as ready for review March 29, 2021 20:52
@thaJeztah
thaJeztah requested a review from tianon as a code owner March 29, 2021 20:52
@tiborvass
tiborvass merged commit cdd71c6 into moby:20.10 Apr 1, 2021
@thaJeztah
thaJeztah deleted the 20.10_backport_bump_libnetwork branch April 1, 2021 09:41
@JohnUiterwyk JohnUiterwyk mentioned this pull request Apr 13, 2021
Closed
@johntdavis84 johntdavis84 mentioned this pull request Apr 13, 2021
Open
@wget

wget commented Apr 14, 2021

Copy link
Copy Markdown

@thaJeztah Hello Sebastian! Could you properly tag the latest 20.10.6 release? https://github.com/moby/moby/releases
Because I was monitoring this page automatically and only realized the 20.10.6 was out. :)

@thaJeztah

thaJeztah commented Apr 14, 2021

Copy link
Copy Markdown
Member Author

Looks like it's tagged; https://github.com/moby/moby/releases/tag/v20.10.6
But probably github releases not showing that as a release as it hides tags once a repository has done "github release"

@thaJeztah

thaJeztah commented Apr 14, 2021

Copy link
Copy Markdown
Member Author

ok; added a GitHub release https://github.com/moby/moby/releases/tag/v20.10.6

@alexandru-lazarev

alexandru-lazarev commented Apr 20, 2021 •
edited by thaJeztah
Loading

Copy link
Copy Markdown

After update to 20.10.06 issue happened again on CentOS 7.9 with ipv6 disabled (I really do not need it) - any ideea how to fix it?

root@AlexL:~ # docker run -e POSTGRES_PASSWORD=password -p 5432:5432 postgres:12.4
docker: Error response from daemon: driver failed programming external connectivity on endpoint sleepy_wilson (4c360a7cf5c62a8ee4199ebe623b20154e12a8b9902c796bf7009a3e742bb1ab): Error starting userland proxy: listen tcp6 [::]:5432: socket: address family not supported by protocol.
ERRO[0000] error waiting for container: context canceled

@rfay rfay mentioned this pull request Apr 22, 2021
Open
@frozenbonito frozenbonito mentioned this pull request Apr 26, 2021
Merged
@arjun024 arjun024 mentioned this pull request Apr 28, 2021
Merged
4 tasks
buildroot-auto-update pushed a commit to buildroot/buildroot that referenced this pull request May 2, 2021
@jacmet
package/docker-engine: bump version to 20.10.6
e1458fe 
Fixes various networking issues:

- Fix a regression in docker 20.10, causing IPv6 addresses no longer to be
  bound by default when mapping ports moby/moby#42205

- Fix implicit IPv6 port-mappings not included in API response.  Before
  docker 20.10, published ports were accessible through both IPv4 and IPv6
  by default, but the API only included information about the IPv4 (0.0.0.0)
  mapping moby/moby#42205

- Fix a regression in docker 20.10, causing the docker-proxy to not be
  terminated in all cases moby/moby#42205

- Fix iptables forwarding rules not being cleaned up upon container removal
  moby/moby#42205

For more details, see the release notes:
https://docs.docker.com/engine/release-notes/#20106

Signed-off-by: Mario Fink <[email protected]>
Tested-by: Christian Stewart <[email protected]>
Signed-off-by: Peter Korsgaard <[email protected]>
buildroot-auto-update pushed a commit to buildroot/buildroot that referenced this pull request May 7, 2021
@jacmet
package/docker-engine: bump version to 20.10.6
e4d06d2 
Fixes various networking issues:

- Fix a regression in docker 20.10, causing IPv6 addresses no longer to be
  bound by default when mapping ports moby/moby#42205

- Fix implicit IPv6 port-mappings not included in API response.  Before
  docker 20.10, published ports were accessible through both IPv4 and IPv6
  by default, but the API only included information about the IPv4 (0.0.0.0)
  mapping moby/moby#42205

- Fix a regression in docker 20.10, causing the docker-proxy to not be
  terminated in all cases moby/moby#42205

- Fix iptables forwarding rules not being cleaned up upon container removal
  moby/moby#42205

For more details, see the release notes:
https://docs.docker.com/engine/release-notes/#20106

Signed-off-by: Mario Fink <[email protected]>
Tested-by: Christian Stewart <[email protected]>
Signed-off-by: Peter Korsgaard <[email protected]>
(cherry picked from commit e1458fe)
Signed-off-by: Peter Korsgaard <[email protected]>
@tomelliff tomelliff mentioned this pull request May 18, 2021
Closed
@aminvakil aminvakil mentioned this pull request Apr 5, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tiborvass tiborvass tiborvass approved these changes
@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes
@tianon tianon Awaiting requested review from tianon tianon is a code owner

Assignees

No one assigned

Labels

area/networking Networking impact/changelog kind/bugfix PR's that fix bugs status/2-code-review

Projects

None yet

Milestone

20.10.6

Development

Successfully merging this pull request may close these issues.

5 participants

@thaJeztah @wget @alexandru-lazarev @tiborvass @AkihiroSuda