Merge pull request #32891 from wojtek-t/route_controller_fix

Automatic merge from submit-queue Don't update NodeNetworkUnavailable condition if it's already set cor… Ref #32571

Merge pull request #32891 from wojtek-t/route_controller_fix
9fc8ebda · Kubernetes Submit Queue · GitHub · f84e1387 · d7d62497 · 9fc8ebda
Commit 9fc8ebda authored Sep 17, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 17, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

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

No files found.
--- a/pkg/controller/route/routecontroller.go
+++ b/pkg/controller/route/routecontroller.go
@@ -137,7 +137,11 @@ func (rc *RouteController) reconcile(nodes []api.Node, routes []*cloudprovider.R
 				}
 			}(node.Name, nameHint, route)
 		} else {
-			rc.updateNetworkingCondition(node.Name, true)
+			// Update condition only if it doesn't reflect the current state.
+			_, condition := api.GetNodeCondition(&node.Status, api.NodeNetworkUnavailable)
+			if condition == nil || condition.Status != api.ConditionFalse {
+				rc.updateNetworkingCondition(node.Name, true)
+			}
 		}
 		nodeCIDRs[node.Name] = node.Spec.PodCIDR
 	}