From c7f94d8a7487813dca15b2208967ee0b4457723e Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Thu, 13 Jul 2017 16:28:02 +0100
Subject: [PATCH] join with original renderer in ConnectionJoin

This guarantees that the output won't contain bare nodes containing
just an id and topology, as produced by ipToNode. Previously this was
ensured by calling convention, now it's ensured by construction.
---
 render/container.go | 18 ++++++++----------
 render/pod.go       |  3 +--
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/render/container.go b/render/container.go
index 679158225..b7e5c367a 100644
--- a/render/container.go
+++ b/render/container.go
@@ -36,12 +36,7 @@ var ContainerRenderer = MakeFilter(
 			MapProcess2Container,
 			ColorConnectedProcessRenderer,
 		),
-
-		// This mapper brings in connections by joining with container
-		// IPs.
 		ConnectionJoin(MapContainer2IP, SelectContainer),
-
-		SelectContainer,
 	),
 )
 
@@ -68,12 +63,15 @@ func ConnectionJoin(toIPs func(report.Node) []string, r Renderer) Renderer {
 		return result
 	}
 
-	return MakeMap(
-		ipToNode,
-		MakeReduce(
-			MakeMap(nodeToIP, r),
-			mapEndpoint2IP,
+	return MakeReduce(
+		MakeMap(
+			ipToNode,
+			MakeReduce(
+				MakeMap(nodeToIP, r),
+				mapEndpoint2IP,
+			),
 		),
+		r,
 	)
 }
 
diff --git a/render/pod.go b/render/pod.go
index 127aaaf98..726a8e5ee 100644
--- a/render/pod.go
+++ b/render/pod.go
@@ -48,8 +48,7 @@ var PodRenderer = ConditionalRenderer(renderKubernetesTopologies,
 					),
 				),
 			),
-			selectPodsWithDeployments{},
-			ConnectionJoin(MapPod2IP, SelectPod),
+			ConnectionJoin(MapPod2IP, selectPodsWithDeployments{}),
 		),
 	),
 )