-
Notifications
You must be signed in to change notification settings - Fork 18.6k
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.
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
libnetwork: remove more config bits related to external k/v stores #43099
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ring A number of tests in the TestDockerDaemonSuite create a custom bridge as part of the test. In some cases, an existing `docker0` bridge could interfere with those tests. For example, the `TestDaemonICCLinkExpose` and `TestDaemonICCPing` verify that no "icc" communication is possible, and for this create a new bridge with a custom IP-range. However, depending on which tests ran before the test, a default `docker0` bridge may exist (e.g., if the`TestDefaultGatewayIPv4Implicit`) with the same IP-range, in which iptables rules may have been set up that allow communication, and thus make the "icc" tests fail. This patch removes the `docker0` interface at the start of tests that create their own bridge to prevent it from interfering. Note that alternatively, we could update those tests to use an IP-range that's less likely to overlap, but this may be more brittle (but could still be done in addition to this change as a follow-up). To verify these changes; make DOCKER_GRAPHDRIVER=vfs TEST_SKIP_INTEGRATION=1 TESTFLAGS='-test.run TestDockerDaemonSuite/TestDaemon(DefaultGatewayIPv4|ICC)' test-integration-cli Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Use unique names to prevent tests from interfering, using a shorter name, as there's a maximum length for these. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Anca Iordache <anca.iordache@docker.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
added
status/2-code-review
area/networking
impact/deprecation
kind/refactor
PR's that refactor, or clean-up code
labels
Dec 22, 2021
Flaky test on Windows: #42612
This one as well #42484:
|
looks like this is all green, so may as well include it in #42247 after all |
thaJeztah
removed
status/2-code-review
area/networking
impact/deprecation
kind/refactor
PR's that refactor, or clean-up code
labels
Dec 22, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
More changes related to #42247, but that was "green", and I didn't want to jinx it, so pushing as a follow-up / draft PR to have CI validate it.