Merge pull request #64302 from krmayankk/refactor-rbd

Automatic merge from submit-queue (batch tested with PRs 64204, 64302). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

simplify logic and remove else blocks

```release-note
NONE
```

pkg/scheduler/algorithm/priorities/node_affinity.go

@@ -37,12 +37,11 @@ func CalculateNodeAffinityPriorityMap(pod *v1.Pod, meta interface{}, nodeInfo *s
 		return schedulerapi.HostPriority{}, fmt.Errorf("node not found")
 	}
 
-	var affinity *v1.Affinity
+	// default is the podspec.
+	affinity := pod.Spec.Affinity
 	if priorityMeta, ok := meta.(*priorityMetadata); ok {
+		// We were able to parse metadata, use affinity from there.
 		affinity = priorityMeta.affinity
-	} else {
-		// We couldn't parse metadata - fallback to the podspec.
-		affinity = pod.Spec.Affinity
 	}
 
 	var count int32

pkg/scheduler/schedulercache/node_info.go

@@ -603,18 +603,18 @@ func (n *NodeInfo) FilterOutPods(pods []*v1.Pod) []*v1.Pod {
 	}
 	filtered := make([]*v1.Pod, 0, len(pods))
 	for _, p := range pods {
-		if p.Spec.NodeName == node.Name {
-			// If pod is on the given node, add it to 'filtered' only if it is present in nodeInfo.
-			podKey, _ := getPodKey(p)
-			for _, np := range n.Pods() {
-				npodkey, _ := getPodKey(np)
-				if npodkey == podKey {
-					filtered = append(filtered, p)
-					break
-				}
-			}
-		} else {
+		if p.Spec.NodeName != node.Name {
 			filtered = append(filtered, p)
+			continue
+		}
+		// If pod is on the given node, add it to 'filtered' only if it is present in nodeInfo.
+		podKey, _ := getPodKey(p)
+		for _, np := range n.Pods() {
+			npodkey, _ := getPodKey(np)
+			if npodkey == podKey {
+				filtered = append(filtered, p)
+				break
+			}
 		}
 	}
 	return filtered