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

Merge pull request #86229 from ahg-g/ahg-ds

Browse Source 
Remove daemonset controller's dependency on scheduler metadata
This commit is contained in:
Kubernetes Prow Robot 2019-12-13 00:26:54 -08:00 committed by GitHub
commit f67d3b1a7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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