From 64482907ab47db37cc1d8eb2988120b50c609f95 Mon Sep 17 00:00:00 2001
From: Mike Danese <mikedanese@gmail.com>
Date: Fri, 12 Jun 2015 17:28:34 -0700
Subject: [PATCH] cover more codepaths that hit GetNode in standalone, as well
 as create better error message when we actually do hit GetNode() which is
 likely a programmer/config error

---
 pkg/kubelet/kubelet.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
index c10e1a3d29..f5013f06e3 100644
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -630,6 +630,9 @@ func (kl *Kubelet) listPodsFromDisk() ([]types.UID, error) {
 }
 
 func (kl *Kubelet) GetNode() (*api.Node, error) {
+	if kl.standaloneMode {
+		return nil, errors.New("no node entry for kubelet in standalone mode")
+	}
 	l, err := kl.nodeLister.List()
 	if err != nil {
 		return nil, errors.New("cannot list nodes")
@@ -1569,6 +1572,9 @@ func (kl *Kubelet) handleOutOfDisk(pods []*api.Pod, podSyncTypes map[types.UID]S
 
 // checkNodeSelectorMatching detects pods that do not match node's labels.
 func (kl *Kubelet) checkNodeSelectorMatching(pods []*api.Pod) (fitting []*api.Pod, notFitting []*api.Pod) {
+	if kl.standaloneMode {
+		return pods, notFitting
+	}
 	node, err := kl.GetNode()
 	if err != nil {
 		glog.Errorf("error getting node: %v", err)