Probe reports namespaces #2985
Merged
Probe reports namespaces #2985
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rade
suggested changes
Dec 15, 2017
report/report.go
Outdated
| // Probes did not use to report namespace ids, but since creating a report node requires an id, | ||
| // the namespace name, which is unique, is passed to `MakeNamespaceNodeID | ||
| namespaceID := MakeNamespaceNodeID(ns) | ||
| nodes[namespaceID] = MakeNodeWith(namespaceID, map[string]string{KubernetesName: ns}) |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
report/report.go
Outdated
| @@ -41,6 +42,13 @@ const ( | |||
|
|
|||
| // Used when counting the number of containers | |||
| ContainersKey = "containers" | |||
|
|
|||
| // The following constants are defined in github.com/weaveworks/scope/kubernetes, | |||
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
report/report.go
Outdated
| // and are redefined to avoid import cycles. | ||
| KubernetesState = "kubernetes_state" | ||
| KubernetesName = "kubernetes_name" | ||
| KubernetesNamespace = "kubernetes_namespace" |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
report/report.go
Outdated
| KubernetesState = "kubernetes_state" | ||
| KubernetesName = "kubernetes_name" | ||
| KubernetesNamespace = "kubernetes_namespace" | ||
| KubernetesStateDeleted = "delete" |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
probe/kubernetes/namespace.go
Outdated
| // 1. Declaring a Namespace interface clashes with the already existent kubernetes.Namespace constant in meta.go. | ||
| // This can be solved by naming the interface differently, but there's second issue: | ||
| // 2. Defining a Namespace implementation and composing it with *apiv1.Namespace and Meta also produces name clashes | ||
| // between *apiv1.Namespace and meta.Namespace() |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
rbruggem
force-pushed
the
report-namespaces
branch
from
1e7a84e to
6c906a7
Compare
rade
force-pushed
the
report-namespaces
branch
from
6c906a7 to
53c2ab7
Compare
rade
approved these changes
Jan 2, 2018
rade
approved these changes
Jan 2, 2018
report/report.go
Outdated
| nodes := Nodes{} | ||
| for ns := range namespaces { | ||
| // Namespace ID: | ||
| // Probes did not use to report namespace ids, but since creating a report node requires an id, |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
report/report.go
Outdated
| } | ||
| } | ||
|
|
||
| nodes := Nodes{} |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
rade
reviewed
Jan 2, 2018
report/report_test.go
Outdated
| @@ -7,6 +7,7 @@ import ( | |||
|
|
|||
| "github.com/weaveworks/common/mtime" | |||
| "github.com/weaveworks/common/test" | |||
| "github.com/weaveworks/scope/probe/kubernetes" | |||
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
rade
reviewed
Jan 2, 2018
app/api_topologies.go
Outdated
| if !ok { | ||
| log.Errorf("Error while fetching the namespace's name: %v", n) | ||
| continue | ||
| } |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
added 4 commits
January 3, 2018 13:55
Old probes do not report namespace topologies. `report.upgradeNamespaces()` recontructs namespace topologies using the data available from other kubernetes resources. Also, add a test.
This avoids unnecessary loops.
rbruggem
force-pushed
the
report-namespaces
branch
from
53c2ab7 to
1fb23dd
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If the probe reports namespace topologies, the app, in particular
updateKubeFilters(), is able to avoid unnecessary loops.Fixes #2945.
This PR also fixes incorrect comments and removes
WalkNodes()which was unused.