From 060ebfcea034c1ca2c98960b0e241c429f9183eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9na=C3=AFc=20Huard?= <lhuard@amadeus.com>
Date: Fri, 27 Feb 2015 17:32:28 +0100
Subject: [PATCH] Fix nil pointer dereference in kube-apiserver when etcd is
 not there

---
 pkg/master/pod_cache.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/master/pod_cache.go b/pkg/master/pod_cache.go
index d290e4803c3..a3f24f22375 100644
--- 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 {