mirror of
https://github.com/weaveworks/scope.git
synced 2026-08-19 04:16:21 +00:00
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:
@@ -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",
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -213,11 +213,10 @@ var HostRenderer = MakeReduce(
|
||||
MapX2Host,
|
||||
ContainerImageRenderer,
|
||||
),
|
||||
// Pods don't have a host id - #1142
|
||||
// MakeMap(
|
||||
// MapX2Host,
|
||||
// SelectPod,
|
||||
// ),
|
||||
MakeMap(
|
||||
MapX2Host,
|
||||
PodRenderer,
|
||||
),
|
||||
SelectHost,
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user