Add k8s pod log control (#1298)

* Remove individually vendored k8s.io/kubernetes/pkg/<foo>

* Vendor the whole of vendor/k8s.io/kubernetes/pkg

* Add k8s pod log control

* Tag pods with host id and include them in the host topology as children.

* adding a basic test for kubernetes.Reporter.GetLogs
This commit is contained in:
Tom Wilkie
2016-04-21 13:48:50 +01:00
parent 3c1b068633
commit 99204e1ff7
1506 changed files with 240071 additions and 17730 deletions
+7
View File
@@ -34,6 +34,7 @@ func TestMakeDetailedHostNode(t *testing.T) {
process1NodeSummary.Linkable = true
process2NodeSummary := child(t, render.ProcessRenderer, fixture.ClientProcess2NodeID)
process2NodeSummary.Linkable = true
podNodeSummary := child(t, render.PodRenderer, fixture.ClientPodNodeID)
want := detailed.Node{
NodeSummary: detailed.NodeSummary{
ID: fixture.ClientHostNodeID,
@@ -93,6 +94,12 @@ func TestMakeDetailedHostNode(t *testing.T) {
},
Controls: []detailed.ControlInstance{},
Children: []detailed.NodeSummaryGroup{
{
Label: "Pods",
TopologyID: "pods",
Columns: nil,
Nodes: []detailed.NodeSummary{podNodeSummary},
},
{
Label: "Containers",
TopologyID: "containers",
+2 -2
View File
@@ -218,7 +218,7 @@ var (
RenderedProcesses[fixture.ClientProcess2NodeID],
RenderedContainers[fixture.ClientContainerNodeID],
RenderedContainerImages[fixture.ClientContainerImageNodeID],
//RenderedPods[fixture.ClientPodNodeID], #1142
RenderedPods[fixture.ClientPodNodeID],
)),
fixture.ServerHostNodeID: hostNode(fixture.ServerHostNodeID, render.OutgoingInternetID).
@@ -229,7 +229,7 @@ var (
RenderedProcesses[fixture.NonContainerProcessNodeID],
RenderedContainers[fixture.ServerContainerNodeID],
RenderedContainerImages[fixture.ServerContainerImageNodeID],
//RenderedPods[fixture.ServerPodNodeID], #1142
RenderedPods[fixture.ServerPodNodeID],
)),
// due to https://github.com/weaveworks/scope/issues/1323 we are dropping
+4 -5
View File
@@ -213,11 +213,10 @@ var HostRenderer = MakeReduce(
MapX2Host,
ContainerImageRenderer,
),
// Pods don't have a host id - #1142
// MakeMap(
// MapX2Host,
// SelectPod,
// ),
MakeMap(
MapX2Host,
PodRenderer,
),
SelectHost,
)