Merge pull request #4899 from lhuard1A/fix_panic_kube_apiserver

Fix nil pointer dereference in kube-apiserver when etcd is not there
This commit is contained in:
Brian Grant 2015-02-27 10:10:50 -08:00
commit 900d58ec94

View File

@ -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 {