From 197115853ec58cbb9f24b8319b4fd33c63ed8008 Mon Sep 17 00:00:00 2001 From: CJ Cullen Date: Tue, 26 May 2015 10:43:00 -0700 Subject: [PATCH] Report node.Ready == false until cbr0 is configured correctly --- pkg/kubelet/kubelet.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index cf9fc784c00..e46e4316a9b 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -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) }