Report node.Ready == false until cbr0 is configured correctly

This commit is contained in:
CJ Cullen 2015-05-26 10:43:00 -07:00
parent c312d8230e
commit 197115853e

View File

@ -1819,7 +1819,9 @@ func (kl *Kubelet) setNodeStatus(node *api.Node) error {
networkConfigured := true
if kl.configureCBR0 {
if err := kl.reconcileCBR0(node.Spec.PodCIDR); err != nil {
if len(node.Spec.PodCIDR) == 0 {
networkConfigured = false
} else if err := kl.reconcileCBR0(node.Spec.PodCIDR); err != nil {
networkConfigured = false
glog.Errorf("Error configuring cbr0: %v", err)
}