From bf3ecd7f0387303358f60f28a6fb8af99a45da27 Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Thu, 18 Feb 2016 14:52:10 +0000 Subject: [PATCH] k8s: Add container Ids to container report --- probe/kubernetes/reporter.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/probe/kubernetes/reporter.go b/probe/kubernetes/reporter.go index 5faf33b3d..ab5b91f98 100644 --- a/probe/kubernetes/reporter.go +++ b/probe/kubernetes/reporter.go @@ -1,7 +1,9 @@ package kubernetes import ( + "github.com/weaveworks/scope/probe/docker" "github.com/weaveworks/scope/report" + "k8s.io/kubernetes/pkg/labels" ) @@ -66,11 +68,12 @@ func (r *Reporter) podTopology(services []Service) (report.Topology, report.Topo nodeID := report.MakePodNodeID(p.Namespace(), p.Name()) pods = pods.AddNode(nodeID, p.GetNode()) - container := report.MakeNodeWith(map[string]string{ - PodID: p.ID(), - Namespace: p.Namespace(), - }).WithParents(report.EmptySets.Add(report.Pod, report.MakeStringSet(nodeID))) for _, containerID := range p.ContainerIDs() { + container := report.MakeNodeWith(map[string]string{ + PodID: p.ID(), + Namespace: p.Namespace(), + docker.ContainerID: containerID, + }).WithParents(report.EmptySets.Add(report.Pod, report.MakeStringSet(nodeID))) containers.AddNode(report.MakeContainerNodeID(containerID), container) } return nil