Merge pull request #43906 from FengyunPan/fix-updateNetworkingCondition

Automatic merge from submit-queue Fix Judgment code in cycle The 'i' can not be equal to updateNodeStatusMaxRetries in updateNetworkingCondition(), and can not get error. Let's update it.

Merge pull request #43906 from FengyunPan/fix-updateNetworkingCondition
dc0b1f9e · Kubernetes Submit Queue · GitHub · 8dde5f2c · c0f5b386 · dc0b1f9e
Commit dc0b1f9e authored Mar 31, 2017 by Kubernetes Submit Queue Committed by GitHub Mar 31, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

routecontroller.go pkg/controller/route/routecontroller.go +2 -1

No files found.
--- a/pkg/controller/route/routecontroller.go
+++ b/pkg/controller/route/routecontroller.go
@@ -214,12 +214,13 @@ func (rc *RouteController) updateNetworkingCondition(nodeName types.NodeName, ro
 		if err == nil {
 			return nil
 		}
-		if i == updateNodeStatusMaxRetries || !errors.IsConflict(err) {
+		if !errors.IsConflict(err) {
 			glog.Errorf("Error updating node %s: %v", nodeName, err)
 			return err
 		}
 		glog.Errorf("Error updating node %s, retrying: %v", nodeName, err)
 	}
+	glog.Errorf("Error updating node %s: %v", nodeName, err)
 	return err
 }