upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-03-18 16:47:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #21762 from gmarek/nodecontroller

Browse source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-23 12:48:09 -08:00
commit 8f0ab31d48
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/controller/node/nodecontroller.go
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)
}
}