github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-19 17:16:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #99959 from AliceZhang2016/nodeaffinity-cleanup

Browse Source 
Move nodeaffinity helpers to component-helpers package
This commit is contained in:
Kubernetes Prow Robot
2021-04-21 17:03:53 -07:00
committed by GitHub
parent 232d93037c bdda9728e7
commit 5779fec3c4
4 changed files with 7 additions and 785 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/lifecycle/predicate.go
View File

@@ -20,11 +20,11 @@ import (
"fmt"
v1 "k8s.io/api/core/v1"
v1affinityhelper "k8s.io/component-helpers/scheduling/corev1/nodeaffinity"
"k8s.io/klog/v2"
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
"k8s.io/kubernetes/pkg/kubelet/util/format"
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework"
pluginhelper "k8s.io/kubernetes/pkg/scheduler/framework/plugins/helper"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodeaffinity"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodename"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodeports"
@@ -236,7 +236,9 @@ func GeneralPredicates(pod *v1.Pod, nodeInfo *schedulerframework.NodeInfo) ([]Pr
})
}
if !pluginhelper.PodMatchesNodeSelectorAndAffinityTerms(pod, nodeInfo.Node()) {
// Ignore parsing errors for backwards compatibility.
match, _ := v1affinityhelper.GetRequiredNodeAffinity(pod).Match(nodeInfo.Node())
if !match {
reasons = append(reasons, &PredicateFailureError{nodeaffinity.Name, nodeaffinity.ErrReasonPod})
}
if !nodename.Fits(pod, nodeInfo) {