From d0633d0d8003404db7c8c028ecf84d56ed11443f Mon Sep 17 00:00:00 2001 From: Paul Bellamy Date: Fri, 6 May 2016 15:41:36 +0100 Subject: [PATCH] Render replica set and deployment parents --- render/detailed/node.go | 2 +- render/detailed/node_test.go | 2 +- render/detailed/parents.go | 30 ++++++++++++++++-------------- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/render/detailed/node.go b/render/detailed/node.go index f959f79c9..590e6e887 100644 --- a/render/detailed/node.go +++ b/render/detailed/node.go @@ -143,7 +143,7 @@ var ( { topologyID: report.Service, NodeSummaryGroup: NodeSummaryGroup{ - TopologyID: "pods-by-service", + TopologyID: "services", Label: "Services", Columns: []Column{ {ID: report.Pod, Label: "# Pods"}, diff --git a/render/detailed/node_test.go b/render/detailed/node_test.go index 97f088789..ed4388b08 100644 --- a/render/detailed/node_test.go +++ b/render/detailed/node_test.go @@ -364,7 +364,7 @@ func TestMakeDetailedPodNode(t *testing.T) { { ID: fixture.ServiceNodeID, Label: fixture.ServiceName, - TopologyID: "pods-by-service", + TopologyID: "services", }, }, Connections: []detailed.ConnectionsSummary{ diff --git a/render/detailed/parents.go b/render/detailed/parents.go index eb101bbd3..4094db74e 100644 --- a/render/detailed/parents.go +++ b/render/detailed/parents.go @@ -25,6 +25,8 @@ func Parents(r report.Report, n report.Node) (result []Parent) { }{ report.Container: {r.Container, containerParent}, report.Pod: {r.Pod, podParent}, + report.ReplicaSet: {r.ReplicaSet, replicaSetParent}, + report.Deployment: {r.Deployment, deploymentParent}, report.Service: {r.Service, serviceParent}, report.ContainerImage: {r.ContainerImage, containerImageParent}, report.Host: {r.Host, hostParent}, @@ -62,21 +64,21 @@ func containerParent(n report.Node) Parent { } } -func podParent(n report.Node) Parent { - podName, _ := n.Latest.Lookup(kubernetes.Name) - return Parent{ - ID: n.ID, - Label: podName, - TopologyID: "pods", - } -} +var ( + podParent = kubernetesParent("pods") + replicaSetParent = kubernetesParent("replica-sets") + deploymentParent = kubernetesParent("deployments") + serviceParent = kubernetesParent("services") +) -func serviceParent(n report.Node) Parent { - serviceName, _ := n.Latest.Lookup(kubernetes.Name) - return Parent{ - ID: n.ID, - Label: serviceName, - TopologyID: "pods-by-service", +func kubernetesParent(topology string) func(report.Node) Parent { + return func(n report.Node) Parent { + name, _ := n.Latest.Lookup(kubernetes.Name) + return Parent{ + ID: n.ID, + Label: name, + TopologyID: topology, + } } }