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

Merge pull request #51116 from huzhengchuan/fix_comment_cm 

Automatic merge from submit-queue (batch tested with PRs 38947, 50239, 51115, 51094, 51116)

Fix comment and typos in node_controller

**What this PR does / why we need it**: 
1. fix comment to more accurately
2. fix typos


**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```
NONE
```
pull/6/head
Kubernetes Submit Queue 2017-08-23 08:41:13 -07:00 committed by GitHub
parent 26ed1a7b00 05f52c6f22
commit 2f00e6d72c
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/cloud/node_controller.go
View File

@ -228,7 +228,7 @@ func (cnc *CloudNodeController) MonitorNode() {
time.Sleep(retrySleepTime) time.Sleep(retrySleepTime)
} }
if currentReadyCondition == nil { if currentReadyCondition == nil {
glog.Errorf("Update status of Node %v from CloudNodeController exceeds retry count.", node.Name) glog.Errorf("Update status of Node %v from CloudNodeController exceeds retry count or the Node was deleted.", node.Name)
continue continue
} }
// If the known node status says that Node is NotReady, then check if the node has been removed // If the known node status says that Node is NotReady, then check if the node has been removed
@ -262,7 +262,7 @@ func (cnc *CloudNodeController) MonitorNode() {
} }
} }
// This processes nodes that were added into the cluster, and cloud initializea them if appropriate // This processes nodes that were added into the cluster, and cloud initialize them if appropriate
func (cnc *CloudNodeController) AddCloudNode(obj interface{}) { func (cnc *CloudNodeController) AddCloudNode(obj interface{}) {
node := obj.(*v1.Node) node := obj.(*v1.Node)