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

General k8s fixups
weaveworks · Jan 18, 2016 · aaa767c · aaa767c
2 parents 23fd123 + a84da6c
commit aaa767c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/app/api_topologies.go b/app/api_topologies.go
@@ -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},
 			}},
 		},
 	}

diff --git a/probe/kubernetes/service.go b/probe/kubernetes/service.go
@@ -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))
 }