scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-01 18:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove 'all namespaces' meaning of empty list in PodAffinityTerm

Browse Source
This commit is contained in:
Jordan Liggitt
2017-03-17 00:32:07 -04:00
parent a10c8f49ff
commit 8fda1c716b
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugin/pkg/scheduler/algorithm/priorities/util/topologies.go
View File

@@ -26,13 +26,12 @@ import (
// GetNamespacesFromPodAffinityTerm returns a set of names
// according to the namespaces indicated in podAffinityTerm.
// 1. If the namespaces is nil considers the given pod's namespace
// 2. If the namespaces is empty list then considers all the namespaces
// If namespaces is empty it considers the given pod's namespace.
func GetNamespacesFromPodAffinityTerm(pod *v1.Pod, podAffinityTerm *v1.PodAffinityTerm) sets.String {
names := sets.String{}
if podAffinityTerm.Namespaces == nil {
if len(podAffinityTerm.Namespaces) == 0 {
names.Insert(pod.Namespace)
} else if len(podAffinityTerm.Namespaces) != 0 {
} else {
names.Insert(podAffinityTerm.Namespaces...)
}
return names
@@ -41,7 +40,7 @@ func GetNamespacesFromPodAffinityTerm(pod *v1.Pod, podAffinityTerm *v1.PodAffini
// PodMatchesTermsNamespaceAndSelector returns true if the given <pod>
// matches the namespace and selector defined by <affinityPod>`s <term>.
func PodMatchesTermsNamespaceAndSelector(pod *v1.Pod, namespaces sets.String, selector labels.Selector) bool {
if len(namespaces) != 0 && !namespaces.Has(pod.Namespace) {
if !namespaces.Has(pod.Namespace) {
return false
}