github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-02 17:50:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only consider pod parents living in the same namespace

Browse Source
This commit is contained in:
Alfonso Acosta
2016-08-25 16:05:01 +00:00
parent 32edfc9112
commit 8a7812eab9
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
probe/kubernetes/reporter.go
View File

@@ -284,6 +284,7 @@ func (r *Reporter) replicaSetTopology(probeID string, deployments []Deployment)
for _, deployment := range deployments {
selectors = append(selectors, match(
deployment.Namespace(),
deployment.Selector(),
report.Deployment,
report.MakeDeploymentNodeID(deployment.UID()),
@@ -337,12 +338,13 @@ var GetNodeName = func(r *Reporter) (string, error) {
type labelledChild interface {
Labels() map[string]string
AddParent(string, string)
Namespace() string
}
// Match parses the selectors and adds the target as a parent if the selector matches.
func match(selector labels.Selector, topology, id string) func(labelledChild) {
func match(namespace string, selector labels.Selector, topology, id string) func(labelledChild) {
return func(c labelledChild) {
if selector.Matches(labels.Set(c.Labels())) {
if namespace == c.Namespace() && selector.Matches(labels.Set(c.Labels())) {
c.AddParent(topology, id)
}
}
@@ -370,6 +372,7 @@ func (r *Reporter) podTopology(services []Service, replicaSets []ReplicaSet) (re
})
for _, service := range services {
selectors = append(selectors, match(
service.Namespace(),
service.Selector(),
report.Service,
report.MakeServiceNodeID(service.UID()),
@@ -377,6 +380,7 @@ func (r *Reporter) podTopology(services []Service, replicaSets []ReplicaSet) (re
}
for _, replicaSet := range replicaSets {
selectors = append(selectors, match(
replicaSet.Namespace(),
replicaSet.Selector(),
report.ReplicaSet,
report.MakeReplicaSetNodeID(replicaSet.UID()),