Merge pull request #26207 from zmerlynn/fix-unneeded-updated

nodecontroller: Fix log message on successful update
kubernetes · May 27, 2016 · 7522389 · 7522389
2 parents 4047ca1 + cb69960
commit 7522389
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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)