Because we filter on image name we need the image name before filtering

weaveworks · Apr 25, 2016 · a426ca2 · a426ca2
1 parent 949165d
commit a426ca2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/render/container.go b/render/container.go
@@ -149,7 +149,7 @@ func ContainerImageRenderer(filter Decorator) Renderer {
 		MakeReduce(
 			MakeMap(
 				MapContainer2ContainerImage,
-				filter(ContainerRenderer),
+				filter(ContainerWithImageNameRenderer),
 			),
 			SelectContainerImage,
 		),
@@ -163,7 +163,7 @@ func ContainerHostnameRenderer(filter Decorator) Renderer {
 		MakeReduce(
 			MakeMap(
 				MapContainer2Hostname,
-				filter(ContainerRenderer),
+				filter(ContainerWithImageNameRenderer),
 			),
 			// Grab *all* the hostnames, so we can count the number which were empty
 			// for accurate stats.

diff --git a/render/detailed/node_test.go b/render/detailed/node_test.go
@@ -305,7 +305,7 @@ func TestMakeDetailedPodNode(t *testing.T) {
 	}
 	have := detailed.MakeNode("pods", fixture.Report, renderableNodes, renderableNode)
 
-	containerNodeSummary := child(t, render.ContainerRenderer, fixture.ServerContainerNodeID)
+	containerNodeSummary := child(t, render.ContainerWithImageNameRenderer, fixture.ServerContainerNodeID)
 	serverProcessNodeSummary := child(t, render.ProcessRenderer, fixture.ServerProcessNodeID)
 	serverProcessNodeSummary.Linkable = true // Temporary workaround for: https://github.com/weaveworks/scope/issues/1295
 	want := detailed.Node{

diff --git a/render/pod.go b/render/pod.go
@@ -26,7 +26,7 @@ func PodRenderer(filter Decorator) Renderer {
 				},
 				ColorConnected(MakeMap(
 					MapContainer2Pod,
-					filter(ContainerRenderer),
+					filter(ContainerWithImageNameRenderer),
 				)),
 			),
 			SelectPod,