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

Merge pull request #834 from weaveworks/k8s-text-change

Browse Source 
General k8s fixups
This commit is contained in:
Paul Bellamy
2016-01-18 14:42:19 +00:00
parent 23fd123370 a84da6cf1c
commit aaa767cccc
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/api_topologies.go
View File

@@ -23,8 +23,8 @@ var (
renderer: render.PodRenderer,
Name: "Pods",
Options: map[string][]APITopologyOption{"system": {
{"show", "System containers shown", false, render.FilterNoop},
{"hide", "System containers hidden", true, render.FilterSystem},
{"show", "System pods shown", false, render.FilterNoop},
{"hide", "System pods hidden", true, render.FilterSystem},
}},
},
{
@@ -33,8 +33,8 @@ var (
renderer: render.PodServiceRenderer,
Name: "by service",
Options: map[string][]APITopologyOption{"system": {
{"show", "System containers shown", false, render.FilterNoop},
{"hide", "System containers hidden", true, render.FilterSystem},
{"show", "System services shown", false, render.FilterNoop},
{"hide", "System services hidden", true, render.FilterSystem},
}},
},
}

3
probe/kubernetes/service.go
View File

@@ -46,6 +46,9 @@ func (s *service) Namespace() string {
}
func (s *service) Selector() labels.Selector {
if s.Spec.Selector == nil {
return labels.Nothing()
}
return labels.SelectorFromSet(labels.Set(s.Spec.Selector))
}