Merge pull request kubernetes#4899 from lhuard1A/fix_panic_kube_apise…

…rver Fix nil pointer dereference in kube-apiserver when etcd is not there
satnam6502 · Feb 27, 2015 · 900d58e · 900d58e
2 parents c6175fa + 060ebfc
commit 900d58e
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/pkg/master/pod_cache.go b/pkg/master/pod_cache.go
@@ -214,6 +214,7 @@ func (p *PodCache) GarbageCollectPodStatus() {
 	pods, err := p.pods.ListPods(api.NewContext(), labels.Everything())
 	if err != nil {
 		glog.Errorf("Error getting pod list: %v", err)
+		return
 	}
 	keys := map[objKey]bool{}
 	for _, pod := range pods.Items {