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

pkg/kubelet/kubelet_node_status.go

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