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

Merge pull request #39273 from NickrenREN/kubelet-node-status

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 39001, 39104, 35978, 39361, 39273)

delete SetNodeStatus() function and fix some function notes words
This commit is contained in:
Kubernetes Submit Queue 2017-01-03 17:18:12 -08:00 committed by GitHub
commit 9eaf1aa38f
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/kubelet/kubelet_node_status.go
View File

@ -339,7 +339,7 @@ func (kl *Kubelet) tryUpdateNodeStatus(tryNumber int) error {
// from here are the majority of load on apiserver and etcd. // from here are the majority of load on apiserver and etcd.
// To reduce the load on etcd, we are serving GET operations from // To reduce the load on etcd, we are serving GET operations from
// apiserver cache (the data might be slightly delayed but it doesn't // apiserver cache (the data might be slightly delayed but it doesn't
// seem to cause more confilict - the delays are pretty small). // seem to cause more conflict - the delays are pretty small).
// If it result in a conflict, all retries are served directly from etcd. // If it result in a conflict, all retries are served directly from etcd.
opts := metav1.GetOptions{} opts := metav1.GetOptions{}
if tryNumber == 0 { if tryNumber == 0 {
@ -376,11 +376,11 @@ func (kl *Kubelet) tryUpdateNodeStatus(tryNumber int) error {
// recordNodeStatusEvent records an event of the given type with the given // recordNodeStatusEvent records an event of the given type with the given
// message for the node. // message for the node.
func (kl *Kubelet) recordNodeStatusEvent(eventtype, event string) { func (kl *Kubelet) recordNodeStatusEvent(eventType, event string) {
glog.V(2).Infof("Recording %s event message for node %s", event, kl.nodeName) glog.V(2).Infof("Recording %s event message for node %s", event, kl.nodeName)
// TODO: This requires a transaction, either both node status is updated // TODO: This requires a transaction, either both node status is updated
// and event is recorded or neither should happen, see issue #6055. // and event is recorded or neither should happen, see issue #6055.
kl.recorder.Eventf(kl.nodeRef, eventtype, event, "Node %s status is now: %s", kl.nodeName, event) kl.recorder.Eventf(kl.nodeRef, eventType, event, "Node %s status is now: %s", kl.nodeName, event)
} }
// Set IP and hostname addresses for the node. // Set IP and hostname addresses for the node.
@ -765,7 +765,7 @@ func (kl *Kubelet) setNodeDiskPressureCondition(node *v1.Node) {
// Update the heartbeat time // Update the heartbeat time
condition.LastHeartbeatTime = currentTime condition.LastHeartbeatTime = currentTime
// Note: The conditions below take care of the case when a new NodeDiskressure condition is // Note: The conditions below take care of the case when a new NodeDiskPressure condition is
// created and as well as the case when the condition already exists. When a new condition // created and as well as the case when the condition already exists. When a new condition
// is created its status is set to v1.ConditionUnknown which matches either // is created its status is set to v1.ConditionUnknown which matches either
// condition.Status != v1.ConditionTrue or // condition.Status != v1.ConditionTrue or
@ -794,7 +794,7 @@ func (kl *Kubelet) setNodeDiskPressureCondition(node *v1.Node) {
} }
} }
// Set OODcondition for the node. // Set OODCondition for the node.
func (kl *Kubelet) setNodeOODCondition(node *v1.Node) { func (kl *Kubelet) setNodeOODCondition(node *v1.Node) {
currentTime := metav1.NewTime(kl.clock.Now()) currentTime := metav1.NewTime(kl.clock.Now())
var nodeOODCondition *v1.NodeCondition var nodeOODCondition *v1.NodeCondition
@ -917,14 +917,6 @@ func (kl *Kubelet) defaultNodeStatusFuncs() []func(*v1.Node) error {
} }
} }
// SetNodeStatus returns a functional Option that adds the given node status
// update handler to the Kubelet
func SetNodeStatus(f func(*v1.Node) error) Option {
return func(k *Kubelet) {
k.setNodeStatusFuncs = append(k.setNodeStatusFuncs, f)
}
}
// Validate given node IP belongs to the current host // Validate given node IP belongs to the current host
func (kl *Kubelet) validateNodeIP() error { func (kl *Kubelet) validateNodeIP() error {
if kl.nodeIP == nil { if kl.nodeIP == nil {