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

[19.03] roll-back libnetwork iptables forward policy change [DESKTOP-1934] #398

Merged

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Oct 7, 2019

this rolls back the libnetwork bump from 559be42 with 1 commit

The patch made in moby/libnetwork#2450 caused a breaking change in the
networking behaviour, causing Kubernetes installations on Docker Desktop
(and possibly other setups) to fail.

Rolling back this change in the 19.03 branch while we investigate if there
are alternatives.

diff: moby/libnetwork@45c7102...96bcc0d

@thaJeztah thaJeztah added this to the 19.03.3 milestone Oct 7, 2019
@thaJeztah thaJeztah force-pushed the 19.03_rollback_libnetwork branch from 6fa036b to 084a4e2 Compare October 7, 2019 16:11
The patch made in  moby/libnetwork#2450 caused a breaking change in the
networking behaviour, causing Kubernetes installations on Docker Desktop
(and possibly other setups) to fail.

Rolling back this change in the 19.03 branch while we investigate if there
are alternatives.

diff: moby/libnetwork@45c7102...96bcc0d

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the 19.03_rollback_libnetwork branch from 084a4e2 to fb0fca8 Compare October 7, 2019 16:11
@thaJeztah
Copy link
Member Author

@andrewhsu andrewhsu requested a review from arkodg October 7, 2019 16:53
Copy link

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

SGTM on green

@justincormack
Copy link

justincormack commented Oct 7, 2019 via email

@andrewhsu
Copy link

Hmm...just one test failure:

--- FAIL: TestContainerBindMountNonRecursive (2.13s)
    mounts_linux_test.go:261: assertion failed: error is not nil: Error response from daemon: ttrpc: closed: unknown

@thaJeztah
Copy link
Member Author

kicked CI, but if we think it's ok, we can merge

@joeabbey
Copy link

joeabbey commented Oct 7, 2019

Why did this one fail

[2019-10-07T18:45:19.141Z] --- FAIL: TestInspect (12.14s)
[2019-10-07T18:45:19.141Z]     inspect_test.go:23: Creating a new daemon at: /go/src/github.com/docker/docker/bundles/test-integration/TestInspect
[2019-10-07T18:45:19.141Z]     daemon.go:325: [d3ca03e6346e4] waiting for daemon to start
[2019-10-07T18:45:19.141Z]     daemon.go:325: [d3ca03e6346e4] waiting for daemon to start
[2019-10-07T18:45:19.141Z]     daemon.go:353: [d3ca03e6346e4] daemon started
[2019-10-07T18:45:19.141Z]     inspect_test.go:39: timeout hit after 10s: waiting for tasks to enter run state. task failed with error: task: non-zero exit (1)
[2019-10-07T18:45:19.141Z]     daemon.go:461: [d3ca03e6346e4] Stopping daemon
[2019-10-07T18:45:19.141Z]     daemon.go:296: [d3ca03e6346e4] exiting daemon
[2019-10-07T18:45:19.141Z]     daemon.go:448: [d3ca03e6346e4] Daemon stopped
[2019-10-07T18:45:19.141Z] === RUN   TestDockerNetworkConnectAlias

@thaJeztah
Copy link
Member Author

Daemon logs of the daemon for that test:
d3ca03e6346e4.log

@joeabbey
Copy link

joeabbey commented Oct 7, 2019

@thaJeztah
Copy link
Member Author

ah, that's probably because it's diffing the wrong diff 😞 need to backport moby#40035 for that

@thaJeztah
Copy link
Member Author

I created an escape hatch for that; let me rebuild with the "skip dco" option set

@thaJeztah
Copy link
Member Author

It's green now; I skipped the DCO check, but the commit is signed-off;

Screenshot 2019-10-07 at 23 10 30

I'll backport moby#40035 to get this to prevent the DCO flakiness

@thaJeztah
Copy link
Member Author

bringing this one in

@thaJeztah thaJeztah merged commit 3e077fc into docker-archive:19.03 Oct 7, 2019
@thaJeztah thaJeztah deleted the 19.03_rollback_libnetwork branch October 7, 2019 21:12
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants