When k8s present, allow filtering of containers by namespace #2285
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
2opremio
reviewed
Feb 28, 2017
app/api_topologies.go
Outdated
| kubernetesFilters(ns...), unmanagedFilter, | ||
| }) | ||
| if len(ns) > 0 { | ||
| // We only want to apply k8s filters if any k8s info is present |
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.
2opremio
reviewed
Feb 28, 2017
| for i, t := range topologies { | ||
| if t.id == podsID || t.id == servicesID || t.id == deploymentsID || t.id == replicaSetsID { | ||
| topologies[i] = updateTopologyFilters(t, []APITopologyOptionGroup{ | ||
| kubernetesFilters(ns...), unmanagedFilter, |
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.
2opremio
reviewed
Feb 28, 2017
render/filters.go
Outdated
| @@ -293,7 +293,14 @@ func IsNotPseudo(n report.Node) bool { | |||
| // IsNamespace checks if the node is a pod/service in the specified namespace | |||
| func IsNamespace(namespace string) FilterFunc { | |||
| return func(n report.Node) bool { | |||
| gotNamespace, _ := n.Latest.Lookup(kubernetes.Namespace) | |||
| try_keys := []string{kubernetes.Namespace, docker.LabelPrefix + "io.kubernetes.pod.namespace"} | |||
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.
|
@ekimekim ping |
ekimekim
force-pushed
the
mike/k8s-ns-in-container-view
branch
from
92621b4
to
bc6e030
Compare
To facilitate this, we replace the existing functionality of updateFilters which sets k8s topologies to have the filters [namespace, managed], to instead append the namespace filter to any existing. This lets it apply to both k8s and container topologies without overwriting existing container filters. We instead set the managed filter in the static definition. This however has the side effect that the ordering of the namespace filter and the managed filter in k8s topologies has been reversed, so it reads: Show Unmanaged | Hide Unmanaged foo | bar | default | baz | All Namespaces instead of: foo | bar | default | baz | All Namespaces Show Unmanaged | Hide Unmanaged
ekimekim
force-pushed
the
mike/k8s-ns-in-container-view
branch
from
bc6e030
to
b01e890
Compare
|
ptal |
2opremio
approved these changes
Mar 16, 2017
ekimekim
added a commit
that referenced
this pull request
Mar 17, 2017
Revert "Merge pull request #2285 from weaveworks/mike/k8s-ns-in-container-view"
ekimekim
added a commit
that referenced
this pull request
Mar 20, 2017
…in-container-view"" This reverts commit d55c528.
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.
To facilitate this, we replace the existing functionality of updateFilters which
sets k8s topologies to have the filters [namespace, managed], to instead append the namespace filter
to any existing. This lets it apply to both k8s and container topologies without overwriting existing
container filters. We instead set the managed filter in the static definition.
This however has the side effect that the ordering of the namespace filter and the managed filter
in k8s topologies has been reversed, so it reads:
instead of:
Fixes #1504