github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-21 09:34:40 +00:00
Code Issues Projects Releases Wiki Activity

Addressed reviewer comments

Browse Source
This commit is contained in:
Bobby (Babak) Salamat 2018-04-16 16:09:24 -07:00
parent c590ec7ae9
commit 4f2155ae22
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/scheduler/algorithm/predicates/predicates.go
View File

@ -1177,10 +1177,10 @@ func (c *PodAffinityChecker) podMatchesPodAffinityTerms(pod *v1.Pod, targetPod *
if err != nil { if err != nil {
return false, false, err return false, false, err
} }
affinityTermPropertiesMatch := podMatchesAffinityTermProperties(targetPod, props) if !podMatchesAffinityTermProperties(targetPod, props) {
if !affinityTermPropertiesMatch {
return false, false, nil return false, false, nil
} }
// Namespace and selector of the terms have matched. Now we check topology of the terms.
targetPodNode, err := c.info.GetNodeInfo(targetPod.Spec.NodeName) targetPodNode, err := c.info.GetNodeInfo(targetPod.Spec.NodeName)
if err != nil { if err != nil {
return false, false, err return false, false, err
@ -1190,10 +1190,10 @@ func (c *PodAffinityChecker) podMatchesPodAffinityTerms(pod *v1.Pod, targetPod *
return false, false, fmt.Errorf("empty topologyKey is not allowed except for PreferredDuringScheduling pod anti-affinity") return false, false, fmt.Errorf("empty topologyKey is not allowed except for PreferredDuringScheduling pod anti-affinity")
} }
if !priorityutil.NodesHaveSameTopologyKey(nodeInfo.Node(), targetPodNode, term.TopologyKey) { if !priorityutil.NodesHaveSameTopologyKey(nodeInfo.Node(), targetPodNode, term.TopologyKey) {
return false, affinityTermPropertiesMatch, nil return false, true, nil
} }
} }
return true, affinityTermPropertiesMatch, nil return true, true, nil
} }
// GetPodAffinityTerms gets pod affinity terms by a pod affinity object. // GetPodAffinityTerms gets pod affinity terms by a pod affinity object.
@ -1490,7 +1490,7 @@ func (c *PodAffinityChecker) satisfiesPodsAffinityAntiAffinity(pod *v1.Pod,
if !matchFound && len(affinityTerms) > 0 { if !matchFound && len(affinityTerms) > 0 {
// We have not been able to find any matches for the pod's affinity rules. // We have not been able to find any matches for the pod's affinity rules.
// This pod may the first pod in a series that have affinity to themselves. In order // This pod may be the first pod in a series that have affinity to themselves. In order
// to not leave such pods in pending state forever, we check that if no other pod // to not leave such pods in pending state forever, we check that if no other pod
// in the cluster matches the namespace and selector of this pod and the pod matches // in the cluster matches the namespace and selector of this pod and the pod matches
// its own terms, then we allow the pod to pass the affinity check. // its own terms, then we allow the pod to pass the affinity check.