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

remove ds dependeny on scheduler metadata

Browse Source
This commit is contained in:
Abdullah Gharaibeh
2019-12-12 19:04:36 -05:00
parent cfdc365525
commit 288609ecf5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/controller/daemon/daemon_controller.go
View File

@@ -1318,9 +1318,9 @@ func NewPod(ds *apps.DaemonSet, nodeName string) *v1.Pod {
// - PodFitsHost: checks pod's NodeName against node
// - PodMatchNodeSelector: checks pod's NodeSelector and NodeAffinity against node
// - PodToleratesNodeTaints: exclude tainted node unless pod has specific toleration
func checkNodeFitness(pod *v1.Pod, meta predicates.Metadata, nodeInfo *schedulernodeinfo.NodeInfo) (bool, []predicates.PredicateFailureReason, error) {
func checkNodeFitness(pod *v1.Pod, nodeInfo *schedulernodeinfo.NodeInfo) (bool, []predicates.PredicateFailureReason, error) {
var predicateFails []predicates.PredicateFailureReason
fit, reasons, err := predicates.PodFitsHost(pod, meta, nodeInfo)
fit, reasons, err := predicates.PodFitsHost(pod, nil, nodeInfo)
if err != nil {
return false, predicateFails, err
}
@@ -1328,7 +1328,7 @@ func checkNodeFitness(pod *v1.Pod, meta predicates.Metadata, nodeInfo *scheduler
predicateFails = append(predicateFails, reasons...)
}
fit, reasons, err = predicates.PodMatchNodeSelector(pod, meta, nodeInfo)
fit, reasons, err = predicates.PodMatchNodeSelector(pod, nil, nodeInfo)
if err != nil {
return false, predicateFails, err
}
@@ -1351,7 +1351,7 @@ func checkNodeFitness(pod *v1.Pod, meta predicates.Metadata, nodeInfo *scheduler
func Predicates(pod *v1.Pod, nodeInfo *schedulernodeinfo.NodeInfo) (bool, []predicates.PredicateFailureReason, error) {
var predicateFails []predicates.PredicateFailureReason
fit, reasons, err := checkNodeFitness(pod, nil, nodeInfo)
fit, reasons, err := checkNodeFitness(pod, nodeInfo)
if err != nil {
return false, predicateFails, err
}