topogen: allocate ipv4 subnets for docker #3840
Merged
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
If we just specify an IPv6 subnet in a docker network, docker-compose chooses an IPv4 subnet which might overlap with another IPv4 network that we allocated. This will make the topology fail able to start. This commit prevents this and should fix a few CI errors. Also remove the `--in-docker` flag and supporting code, because it is no longer needed. Also add extra_hosts entry for jaeger tracing.
lukedirtwalker
commented
Jul 28, 2020
There was a problem hiding this comment.
Reviewed 18 of 18 files at r1.
Reviewable status:complete! all files reviewed, all discussions resolved (waiting on @scrye)
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.
If we just specify an IPv6 subnet in a docker network, docker-compose chooses
an IPv4 subnet which might overlap with another IPv4 network that we allocated.
This will make the topology fail able to start. This commit prevents this and
should fix a few CI errors.
Also remove the
--in-dockerflag and supporting code, because it is no longer needed.Also add extra_hosts entry for jaeger tracing.
This change is