From cb6996074242c1b8259ed1f495052da439db3d97 Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Tue, 24 May 2016 14:15:06 -0700 Subject: [PATCH] nodecontroller: Fix log message on successful update --- pkg/controller/node/nodecontroller.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/controller/node/nodecontroller.go b/pkg/controller/node/nodecontroller.go index 804ce745c1c..946d1897e0d 100644 --- a/pkg/controller/node/nodecontroller.go +++ b/pkg/controller/node/nodecontroller.go @@ -375,8 +375,9 @@ func (nc *NodeController) allocateOrOccupyCIDR(obj interface{}) { glog.V(4).Infof("Assigning node %s CIDR %s", node.Name, podCIDR) for rep := 0; rep < podCIDRUpdateRetry; rep++ { node.Spec.PodCIDR = podCIDR.String() - if _, err := nc.kubeClient.Core().Nodes().Update(node); err == nil { - glog.Errorf("Failed while updating Node.Spec.PodCIDR : %v", err) + if _, err := nc.kubeClient.Core().Nodes().Update(node); err != nil { + glog.Errorf("Failed while updating Node.Spec.PodCIDR (%d retries left): %v", podCIDRUpdateRetry-rep-1, err) + } else { break } node, err = nc.kubeClient.Core().Nodes().Get(node.Name)