github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

node: move the reboot detection logic to kubelet 

Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
pull/6/head
Federico Simoncelli 2015-03-27 12:44:40 -04:00
parent 604e0ad328
commit fe2d1f6762
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/cloudprovider/controller/nodecontroller.go
View File

@ -294,16 +294,6 @@ func (nc *NodeController) populateNodeInfo(node *api.Node) error {
for key, value := range nodeInfo.Capacity {
node.Status.Capacity[key] = value
}
if node.Status.NodeInfo.BootID != "" &&
node.Status.NodeInfo.BootID != nodeInfo.NodeSystemInfo.BootID {
ref := &api.ObjectReference{
Kind: "Minion",
Name: node.Name,
UID: node.UID,
Namespace: api.NamespaceDefault,
}
nc.recorder.Eventf(ref, "rebooted", "Node %s has been rebooted", node.Name)
}
node.Status.NodeInfo = nodeInfo.NodeSystemInfo
return nil
}

9
pkg/kubelet/kubelet.go
View File

@ -1752,8 +1752,15 @@ func (kl *Kubelet) tryUpdateNodeStatus() error {
} else {
node.Status.NodeInfo.MachineID = info.MachineID
node.Status.NodeInfo.SystemUUID = info.SystemUUID
node.Status.NodeInfo.BootID = info.BootID
node.Status.Capacity = CapacityFromMachineInfo(info)
if node.Status.NodeInfo.BootID != "" &&
node.Status.NodeInfo.BootID != info.BootID {
// TODO: This requires a transaction, either both node status is updated
// and event is recorded or neither should happen, see issue #6055.
kl.recorder.Eventf(kl.getNodeReference(), "rebooted",
"Node %s has been rebooted, boot id: %s", kl.hostname, info.BootID)
}
node.Status.NodeInfo.BootID = info.BootID
}
currentTime := util.Now()