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

Merge pull request #47416 from allencloud/simplify-if-else

Browse Source 
Automatic merge from submit-queue

simplify if and else for code

Signed-off-by: allencloud <allen.sun@daocloud.io>

**What this PR does / why we need it**:
This PR tries to simplify the code of if and else, and this could make code a little bit cleaner.

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

**Special notes for your reviewer**:
NONE

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-08-05 03:10:10 -07:00 committed by GitHub
commit 58819b0204
1 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/kubelet/kubelet_node_status.go
View File

@ -426,7 +426,8 @@ func (kl *Kubelet) setNodeAddress(node *v1.Node) error {
if kl.externalCloudProvider { if kl.externalCloudProvider {
// We rely on the external cloud provider to supply the addresses. // We rely on the external cloud provider to supply the addresses.
return nil return nil
} else if kl.cloud != nil { }
if kl.cloud != nil {
instances, ok := kl.cloud.Instances() instances, ok := kl.cloud.Instances()
if !ok { if !ok {
return fmt.Errorf("failed to get instances from cloud provider") return fmt.Errorf("failed to get instances from cloud provider")
@ -603,7 +604,9 @@ func (kl *Kubelet) setNodeStatusVersionInfo(node *v1.Node) {
verinfo, err := kl.cadvisor.VersionInfo() verinfo, err := kl.cadvisor.VersionInfo()
if err != nil { if err != nil {
glog.Errorf("Error getting version info: %v", err) glog.Errorf("Error getting version info: %v", err)
} else { return
}
node.Status.NodeInfo.KernelVersion = verinfo.KernelVersion node.Status.NodeInfo.KernelVersion = verinfo.KernelVersion
node.Status.NodeInfo.OSImage = verinfo.ContainerOsVersion node.Status.NodeInfo.OSImage = verinfo.ContainerOsVersion
@ -617,7 +620,6 @@ func (kl *Kubelet) setNodeStatusVersionInfo(node *v1.Node) {
// TODO: kube-proxy might be different version from kubelet in the future // TODO: kube-proxy might be different version from kubelet in the future
node.Status.NodeInfo.KubeProxyVersion = version.Get().String() node.Status.NodeInfo.KubeProxyVersion = version.Get().String()
} }
}
// Set daemonEndpoints for the node. // Set daemonEndpoints for the node.
func (kl *Kubelet) setNodeStatusDaemonEndpoints(node *v1.Node) { func (kl *Kubelet) setNodeStatusDaemonEndpoints(node *v1.Node) {
@ -631,7 +633,9 @@ func (kl *Kubelet) setNodeStatusImages(node *v1.Node) {
containerImages, err := kl.imageManager.GetImageList() containerImages, err := kl.imageManager.GetImageList()
if err != nil { if err != nil {
glog.Errorf("Error getting image list: %v", err) glog.Errorf("Error getting image list: %v", err)
} else { node.Status.Images = imagesOnNode
return
}
// sort the images from max to min, and only set top N images into the node status. // sort the images from max to min, and only set top N images into the node status.
sort.Sort(sliceutils.ByImageSize(containerImages)) sort.Sort(sliceutils.ByImageSize(containerImages))
if maxImagesInNodeStatus < len(containerImages) { if maxImagesInNodeStatus < len(containerImages) {
@ -649,7 +653,7 @@ func (kl *Kubelet) setNodeStatusImages(node *v1.Node) {
SizeBytes: image.Size, SizeBytes: image.Size,
}) })
} }
}
node.Status.Images = imagesOnNode node.Status.Images = imagesOnNode
} }
@ -779,15 +783,13 @@ func (kl *Kubelet) setNodeMemoryPressureCondition(node *v1.Node) {
condition.LastTransitionTime = currentTime condition.LastTransitionTime = currentTime
kl.recordNodeStatusEvent(v1.EventTypeNormal, "NodeHasInsufficientMemory") kl.recordNodeStatusEvent(v1.EventTypeNormal, "NodeHasInsufficientMemory")
} }
} else { } else if condition.Status != v1.ConditionFalse {
if condition.Status != v1.ConditionFalse {
condition.Status = v1.ConditionFalse condition.Status = v1.ConditionFalse
condition.Reason = "KubeletHasSufficientMemory" condition.Reason = "KubeletHasSufficientMemory"
condition.Message = "kubelet has sufficient memory available" condition.Message = "kubelet has sufficient memory available"
condition.LastTransitionTime = currentTime condition.LastTransitionTime = currentTime
kl.recordNodeStatusEvent(v1.EventTypeNormal, "NodeHasSufficientMemory") kl.recordNodeStatusEvent(v1.EventTypeNormal, "NodeHasSufficientMemory")
} }
}
if newCondition { if newCondition {
node.Status.Conditions = append(node.Status.Conditions, *condition) node.Status.Conditions = append(node.Status.Conditions, *condition)
@ -837,15 +839,13 @@ func (kl *Kubelet) setNodeDiskPressureCondition(node *v1.Node) {
condition.LastTransitionTime = currentTime condition.LastTransitionTime = currentTime
kl.recordNodeStatusEvent(v1.EventTypeNormal, "NodeHasDiskPressure") kl.recordNodeStatusEvent(v1.EventTypeNormal, "NodeHasDiskPressure")
} }
} else { } else if condition.Status != v1.ConditionFalse {
if condition.Status != v1.ConditionFalse {
condition.Status = v1.ConditionFalse condition.Status = v1.ConditionFalse
condition.Reason = "KubeletHasNoDiskPressure" condition.Reason = "KubeletHasNoDiskPressure"
condition.Message = "kubelet has no disk pressure" condition.Message = "kubelet has no disk pressure"
condition.LastTransitionTime = currentTime condition.LastTransitionTime = currentTime
kl.recordNodeStatusEvent(v1.EventTypeNormal, "NodeHasNoDiskPressure") kl.recordNodeStatusEvent(v1.EventTypeNormal, "NodeHasNoDiskPressure")
} }
}
if newCondition { if newCondition {
node.Status.Conditions = append(node.Status.Conditions, *condition) node.Status.Conditions = append(node.Status.Conditions, *condition)