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
This commit is contained in:
Kubernetes Submit Queue 2016-09-17 00:39:34 -07:00 committed by GitHub
commit 9fc8ebdafa

View File

@ -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
}