Merge pull request #8819 from cjcullen/notready

Report node.Ready == false until cbr0 is configured correctly
pull/6/head
Saad Ali 2015-05-26 11:44:39 -07:00
commit caf5b5f059
1 changed files with 3 additions and 1 deletions

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)
}