github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

pull/6/head
Mike Danese 2015-06-12 17:28:34 -07:00
parent b1bbf653ab
commit 64482907ab
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/kubelet.go
View File

@ -630,6 +630,9 @@ func (kl *Kubelet) listPodsFromDisk() ([]types.UID, error) {
} }
func (kl *Kubelet) GetNode() (*api.Node, 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() l, err := kl.nodeLister.List()
if err != nil { if err != nil {
return nil, errors.New("cannot list nodes") 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. // checkNodeSelectorMatching detects pods that do not match node's labels.
func (kl *Kubelet) checkNodeSelectorMatching(pods []*api.Pod) (fitting []*api.Pod, notFitting []*api.Pod) { func (kl *Kubelet) checkNodeSelectorMatching(pods []*api.Pod) (fitting []*api.Pod, notFitting []*api.Pod) {
if kl.standaloneMode {
return pods, notFitting
}
node, err := kl.GetNode() node, err := kl.GetNode()
if err != nil { if err != nil {
glog.Errorf("error getting node: %v", err) glog.Errorf("error getting node: %v", err)