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.

Sign up for GitHub

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

Discard short-lived connections to/from Pods in the host net #1944

Merged
merged 2 commits into from
Oct 25, 2016
Merged

Discard short-lived connections to/from Pods in the host net #1944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
529759b
Discard short-lived connections to/from Pods in the host net
Oct 21, 2016
9881a6b
Fix tests
Oct 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/api_topologies_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ func TestAPITopologyAddsKubernetes(t *testing.T) {
{ContainerID: "container2"},
},
},
Spec: api.PodSpec{
SecurityContext: &api.PodSecurityContext{},
},
}).GetNode("")
buf := &bytes.Buffer{}
encoder := codec.NewEncoder(buf, &codec.MsgpackHandle{})
Expand Down
13 changes: 10 additions & 3 deletions probe/kubernetes/pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import (

// These constants are keys used in node metadata
const (
State = "kubernetes_state"
State = "kubernetes_state"
IsInHostNetwork = "kubernetes_is_in_host_network"

StateDeleted = "deleted"
)
Expand Down Expand Up @@ -57,11 +58,17 @@ func (p *pod) NodeName() string {
}

func (p *pod) GetNode(probeID string) report.Node {
return p.MetaNode(report.MakePodNodeID(p.UID())).WithLatests(map[string]string{
latests := map[string]string{
State: p.State(),
IP: p.Status.PodIP,
report.ControlProbeID: probeID,
}).
}

if sc := p.Pod.Spec.SecurityContext; sc != nil && sc.HostNetwork {
latests[IsInHostNetwork] = "true"
}

return p.MetaNode(report.MakePodNodeID(p.UID())).WithLatests(latests).
WithParents(p.parents).
WithLatestActiveControls(GetLogs, DeletePod)
}
6 changes: 5 additions & 1 deletion probe/kubernetes/reporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ var (
},
Spec: api.PodSpec{
NodeName: nodeName,
SecurityContext: &api.PodSecurityContext{
HostNetwork: true,
},
},
}
apiPod2 = api.Pod{
Expand All @@ -65,7 +68,8 @@ var (
},
},
Spec: api.PodSpec{
NodeName: nodeName,
NodeName: nodeName,
SecurityContext: &api.PodSecurityContext{},
},
}
apiService1 = api.Service{
Expand Down
7 changes: 7 additions & 0 deletions render/pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,13 @@ func MapContainer2Pod(n report.Node, _ report.Networks) report.Nodes {
// MapPod2IP maps pod nodes to their IP address. This allows pods to
// be joined directly with the endpoint topology.
func MapPod2IP(m report.Node) []string {
// if this pod belongs to the host's networking namespace
// we cannot use its IP to attribute connections
// (they could come from any other process on the host or DNAT-ed IPs)
if _, ok := m.Latest.Lookup(kubernetes.IsInHostNetwork); ok {
return nil
}

ip, ok := m.Latest.Lookup(kubernetes.IP)
if !ok {
return nil
Expand Down