Node controller produces events with invalid names

This commit is contained in:
derekwaynecarr 2015-09-17 09:59:48 -04:00
parent c2ffe68d0f
commit 1acc203b36

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")
} }
} }
} }