github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14110 from derekwaynecarr/event_name_against_api_conventions

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-09-17 14:40:31 -07:00
commit a5d3918082
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/node/nodecontroller.go
View File

@ -380,13 +380,13 @@ func (nc *NodeController) reconcileNodeCIDRs(nodes *api.NodeList) {
if node.Spec.PodCIDR == "" { if node.Spec.PodCIDR == "" {
podCIDR, found := availableCIDRs.PopAny() podCIDR, found := availableCIDRs.PopAny()
if !found { if !found {
nc.recordNodeStatusChange(&node, "No available CIDR") nc.recordNodeStatusChange(&node, "CIDRNotAvailable")
continue continue
} }
glog.V(4).Infof("Assigning node %s CIDR %s", node.Name, podCIDR) glog.V(4).Infof("Assigning node %s CIDR %s", node.Name, podCIDR)
node.Spec.PodCIDR = podCIDR node.Spec.PodCIDR = podCIDR
if _, err := nc.kubeClient.Nodes().Update(&node); err != nil { if _, err := nc.kubeClient.Nodes().Update(&node); err != nil {
nc.recordNodeStatusChange(&node, "CIDR assignment failed") nc.recordNodeStatusChange(&node, "CIDRAssignmentFailed")
} }
} }
} }