github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #80814 from xiaoanyunfei/cleanup/GeneralPredicates

Browse Source 
Use iteration to make the GeneralPredicates code cleaner
This commit is contained in:
Kubernetes Prow Robot 2019-08-27 00:52:40 -07:00 committed by GitHub
commit ead8e0c24e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1195,20 +1195,14 @@ func haveOverlap(a1, a2 []string) bool {
// that only non-critical pods need and EssentialPredicates are the predicates that all pods, including critical pods, need // that only non-critical pods need and EssentialPredicates are the predicates that all pods, including critical pods, need
func GeneralPredicates(pod *v1.Pod, meta PredicateMetadata, nodeInfo *schedulernodeinfo.NodeInfo) (bool, []PredicateFailureReason, error) { func GeneralPredicates(pod *v1.Pod, meta PredicateMetadata, nodeInfo *schedulernodeinfo.NodeInfo) (bool, []PredicateFailureReason, error) {
var predicateFails []PredicateFailureReason var predicateFails []PredicateFailureReason
fit, reasons, err := noncriticalPredicates(pod, meta, nodeInfo) for _, predicate := range []FitPredicate{noncriticalPredicates, EssentialPredicates} {
if err != nil { fit, reasons, err := predicate(pod, meta, nodeInfo)
return false, predicateFails, err if err != nil {
} return false, predicateFails, err
if !fit { }
predicateFails = append(predicateFails, reasons...) if !fit {
} predicateFails = append(predicateFails, reasons...)
}
fit, reasons, err = EssentialPredicates(pod, meta, nodeInfo)
if err != nil {
return false, predicateFails, err
}
if !fit {
predicateFails = append(predicateFails, reasons...)
} }
return len(predicateFails) == 0, predicateFails, nil return len(predicateFails) == 0, predicateFails, nil
@ -1231,31 +1225,18 @@ func noncriticalPredicates(pod *v1.Pod, meta PredicateMetadata, nodeInfo *schedu
// EssentialPredicates are the predicates that all pods, including critical pods, need // EssentialPredicates are the predicates that all pods, including critical pods, need
func EssentialPredicates(pod *v1.Pod, meta PredicateMetadata, nodeInfo *schedulernodeinfo.NodeInfo) (bool, []PredicateFailureReason, error) { func EssentialPredicates(pod *v1.Pod, meta PredicateMetadata, nodeInfo *schedulernodeinfo.NodeInfo) (bool, []PredicateFailureReason, error) {
var predicateFails []PredicateFailureReason var predicateFails []PredicateFailureReason
fit, reasons, err := PodFitsHost(pod, meta, nodeInfo)
if err != nil {
return false, predicateFails, err
}
if !fit {
predicateFails = append(predicateFails, reasons...)
}
// TODO: PodFitsHostPorts is essential for now, but kubelet should ideally // TODO: PodFitsHostPorts is essential for now, but kubelet should ideally
// preempt pods to free up host ports too // preempt pods to free up host ports too
fit, reasons, err = PodFitsHostPorts(pod, meta, nodeInfo) for _, predicate := range []FitPredicate{PodFitsHost, PodFitsHostPorts, PodMatchNodeSelector} {
if err != nil { fit, reasons, err := predicate(pod, meta, nodeInfo)
return false, predicateFails, err if err != nil {
} return false, predicateFails, err
if !fit { }
predicateFails = append(predicateFails, reasons...) if !fit {
predicateFails = append(predicateFails, reasons...)
}
} }
fit, reasons, err = PodMatchNodeSelector(pod, meta, nodeInfo)
if err != nil {
return false, predicateFails, err
}
if !fit {
predicateFails = append(predicateFails, reasons...)
}
return len(predicateFails) == 0, predicateFails, nil return len(predicateFails) == 0, predicateFails, nil
} }