Merge pull request #14958 from madhusudancs/fix-kubelet-messages

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-10-02 11:55:42 -07:00
commit 1d73382b83

View File

@ -2362,13 +2362,12 @@ func (kl *Kubelet) setNodeStatus(node *api.Node) error {
LastHeartbeatTime: currentTime,
}
} else {
var reasons []string
var messages []string
if !containerRuntimeUp {
messages = append(messages, "container runtime is down")
}
if !networkConfigured {
messages = append(reasons, "network not configured correctly")
messages = append(messages, "network not configured correctly")
}
newNodeReadyCondition = api.NodeCondition{
Type: api.NodeReady,