Merge pull request #21762 from gmarek/nodecontroller

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-23 12:48:09 -08:00
commit 8f0ab31d48

View File

@ -509,7 +509,7 @@ func (nc *NodeController) reconcileNodeCIDRs(nodes *api.NodeList) {
availableCIDRs := generateCIDRs(nc.clusterCIDR, len(nodes.Items))
for _, node := range nodes.Items {
if node.Spec.PodCIDR != "" {
glog.V(1).Infof("CIDR %s is already being used by node %s", node.Spec.PodCIDR, node.Name)
glog.V(4).Infof("CIDR %s is already being used by node %s", node.Spec.PodCIDR, node.Name)
availableCIDRs.Delete(node.Spec.PodCIDR)
}
}