Merge pull request #2682 from weaveworks/2681-image-counts

don't show container count in host detail panel image list Fixes #2681.
weaveworks · Jul 5, 2017 · d22d9d0 · d22d9d0
2 parents fd4f1f9 + 0f4d17d
commit d22d9d0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/render/detailed/node.go b/render/detailed/node.go
@@ -135,7 +135,6 @@ var nodeSummaryGroupSpecs = []struct {
 		topologyID: report.Pod,
 		NodeSummaryGroup: NodeSummaryGroup{
 			Label: "Pods",
-
 			Columns: []Column{
 				{ID: kubernetes.State, Label: "State"},
 				{ID: report.Container, Label: "# Containers", Datatype: "number"},
@@ -155,7 +154,8 @@ var nodeSummaryGroupSpecs = []struct {
 	{
 		topologyID: report.Container,
 		NodeSummaryGroup: NodeSummaryGroup{
-			Label: "Containers", Columns: []Column{
+			Label: "Containers",
+			Columns: []Column{
 				{ID: docker.CPUTotalUsage, Label: "CPU", Datatype: "number"},
 				{ID: docker.MemoryUsage, Label: "Memory", Datatype: "number"},
 			},
@@ -164,7 +164,8 @@ var nodeSummaryGroupSpecs = []struct {
 	{
 		topologyID: report.Process,
 		NodeSummaryGroup: NodeSummaryGroup{
-			Label: "Processes", Columns: []Column{
+			Label: "Processes",
+			Columns: []Column{
 				{ID: process.PID, Label: "PID", Datatype: "number"},
 				{ID: process.CPUUsage, Label: "CPU", Datatype: "number"},
 				{ID: process.MemoryUsage, Label: "Memory", Datatype: "number"},
@@ -174,11 +175,8 @@ var nodeSummaryGroupSpecs = []struct {
 	{
 		topologyID: report.ContainerImage,
 		NodeSummaryGroup: NodeSummaryGroup{
-			TopologyID: "containers-by-image",
-			Label:      "Container Images",
-			Columns: []Column{
-				{ID: report.Container, Label: "# Containers", DefaultSort: true, Datatype: "number"},
-			},
+			Label:   "Container Images",
+			Columns: []Column{},
 		},
 	},
 }

diff --git a/render/detailed/node_test.go b/render/detailed/node_test.go
@@ -132,10 +132,8 @@ func TestMakeDetailedHostNode(t *testing.T) {
 			{
 				Label:      "Container Images",
 				TopologyID: "containers-by-image",
-				Columns: []detailed.Column{
-					{ID: report.Container, Label: "# Containers", DefaultSort: true, Datatype: "number"},
-				},
-				Nodes: []detailed.NodeSummary{containerImageNodeSummary},
+				Columns:    []detailed.Column{},
+				Nodes:      []detailed.NodeSummary{containerImageNodeSummary},
 			},
 		},
 		Connections: []detailed.ConnectionsSummary{