Fetch container IPs directly from the namespace instead of calling 'weave ps' #3207
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
We will use them to fetch IP addresses from container namespaces Required an update to golang.org/x/sys/unix
So that we can rely on the fix to runtime.LockOSThread()
So that we can pick up addresses added via CNI or other mechanisms that Docker is not aware of.
Now that we enter the container namespace to fetch IPs for every container, there is no need to have 'weave ps' do it. This does mean we lose Weave MAC addresses, but that is a rather idiosyncratic feature anyway.
rade
approved these changes
Jun 4, 2018
probe/docker/container.go
Outdated
| } | ||
| for _, cidr := range cidrs { | ||
| ip := cidr.IP.String() | ||
| if !contains(ips, ip) { |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This was referenced Jun 8, 2018
3 tasks
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.
Instead of shelling out to
weave ps, we do what it was doing - enter the container's namespace and report IPs found there. And whereasweave pstook great pains to report only Weave Net addresses, in Scope we want all addresses, so the code is simpler.Fixes #2586
Will probably improve #3082
We can't remove the
weavescript orweaveutilprogram from the container as the App is still using them to doweave expose.