From df1ccae9f6d836825a7ac204f3a1177c097d208e Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Wed, 13 Apr 2016 13:20:31 +0100 Subject: [PATCH] Construct correct id for pod parents --- render/detailed/parents.go | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/render/detailed/parents.go b/render/detailed/parents.go index 991820e09..d9c898b4b 100644 --- a/render/detailed/parents.go +++ b/render/detailed/parents.go @@ -55,41 +55,35 @@ func Parents(r report.Report, n report.Node) (result []Parent) { func containerParent(n report.Node) Parent { label := getRenderableContainerName(n) - containerID, _ := n.Latest.Lookup(docker.ContainerID) return Parent{ - ID: report.MakeContainerNodeID(containerID), + ID: n.ID, Label: label, TopologyID: "containers", } } func podParent(n report.Node) Parent { - namespace, _ := n.Latest.Lookup(kubernetes.Namespace) - podID, _ := n.Latest.Lookup(kubernetes.PodID) podName, _ := n.Latest.Lookup(kubernetes.PodName) return Parent{ - ID: report.MakePodNodeID(namespace, podID), + ID: n.ID, Label: podName, TopologyID: "pods", } } func serviceParent(n report.Node) Parent { - namespace, _ := n.Latest.Lookup(kubernetes.Namespace) - serviceID, _ := n.Latest.Lookup(kubernetes.ServiceID) serviceName, _ := n.Latest.Lookup(kubernetes.ServiceName) return Parent{ - ID: report.MakeServiceNodeID(namespace, serviceID), + ID: n.ID, Label: serviceName, TopologyID: "pods-by-service", } } func containerImageParent(n report.Node) Parent { - imageID, _ := n.Latest.Lookup(docker.ImageID) imageName, _ := n.Latest.Lookup(docker.ImageName) return Parent{ - ID: report.MakeContainerImageNodeID(imageID), + ID: n.ID, Label: imageName, TopologyID: "containers-by-image", } @@ -98,7 +92,7 @@ func containerImageParent(n report.Node) Parent { func hostParent(n report.Node) Parent { hostName, _ := n.Latest.Lookup(host.HostName) return Parent{ - ID: report.MakeHostNodeID(hostName), + ID: n.ID, Label: hostName, TopologyID: "hosts", }