Skip to content
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

Don't attribute conntracked connections to k8s pause containers. #1415

Merged
merged 3 commits into from
May 3, 2016

Conversation

tomwilkie
Copy link
Contributor

Contains #1412; you may want to review in one piece (or not) - up to you.

@@ -216,6 +216,12 @@ func MapContainer2IP(m report.Node, _ report.Networks) report.Nodes {
return report.Nodes{}
}

// if this container doesn't make connections, we can ignore it
_, doesntMakeConnections := m.Latest.Lookup(kubernetes.DoesNotMakeConnection)

This comment was marked as abuse.

@tomwilkie tomwilkie force-pushed the dont-join-ips-with-pause-containers branch from 32e0849 to 1c5f0ac Compare May 3, 2016 11:04
@tomwilkie
Copy link
Contributor Author

@paulbellamy PTAL

@paulbellamy
Copy link
Contributor

Might need rebase, but LGTM.

@tomwilkie tomwilkie merged commit 731e156 into master May 3, 2016
@tomwilkie tomwilkie deleted the dont-join-ips-with-pause-containers branch May 3, 2016 11:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants