Merge pull request #1774 from weaveworks/1759-remove-k8s-id-col

Remove kubernetes_id column from the grid view.
This commit is contained in:
Alfonso Acosta
2016-08-11 17:43:21 +01:00
committed by GitHub
6 changed files with 10 additions and 29 deletions

View File

@@ -90,14 +90,11 @@ var (
ServerContainerImageName = "image/server"
KubernetesNamespace = "ping"
ClientPodID = "ping/pong-a"
ServerPodID = "ping/pong-b"
ClientPodUID = "5d4c3b2a1"
ServerPodUID = "i9h8g7f6e"
ClientPodNodeID = report.MakePodNodeID(ClientPodUID)
ServerPodNodeID = report.MakePodNodeID(ServerPodUID)
ServiceName = "pongservice"
ServiceID = "ping/pongservice"
ServiceUID = "service1234"
ServiceNodeID = report.MakeServiceNodeID(ServiceUID)
@@ -366,7 +363,6 @@ var (
Nodes: report.Nodes{
ClientPodNodeID: report.MakeNodeWith(
ClientPodNodeID, map[string]string{
kubernetes.ID: ClientPodID,
kubernetes.Name: "pong-a",
kubernetes.Namespace: KubernetesNamespace,
report.HostNodeID: ClientHostNodeID,
@@ -377,7 +373,6 @@ var (
),
ServerPodNodeID: report.MakeNodeWith(
ServerPodNodeID, map[string]string{
kubernetes.ID: ServerPodID,
kubernetes.Name: "pong-b",
kubernetes.Namespace: KubernetesNamespace,
kubernetes.State: "running",
@@ -395,7 +390,6 @@ var (
ServiceNodeID: report.MakeNodeWith(
ServiceNodeID, map[string]string{
kubernetes.ID: ServiceID,
kubernetes.Name: "pongservice",
kubernetes.Namespace: "ping",
}).