github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #84746 from Huang-Wei/move-sched-constrants

Browse Source 
Move out const strings in pkg/scheduler/api/well_known_labels.go
This commit is contained in:
Kubernetes Prow Robot
2019-11-06 12:20:06 -08:00
committed by GitHub
parent 64be5ae5f1 019d7497a5
commit b09b962d96
43 changed files with 200 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,6 @@ import (
"k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/pkg/scheduler/algorithm"
priorityutil "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util"
legacyapi "k8s.io/kubernetes/pkg/scheduler/api"
schedulerlisters "k8s.io/kubernetes/pkg/scheduler/listers"
schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo"
schedutil "k8s.io/kubernetes/pkg/scheduler/util"
@@ -1528,7 +1527,7 @@ func CheckNodeUnschedulablePredicate(pod *v1.Pod, meta PredicateMetadata, nodeIn
// If pod tolerate unschedulable taint, it's also tolerate `node.Spec.Unschedulable`.
podToleratesUnschedulable := v1helper.TolerationsTolerateTaint(pod.Spec.Tolerations, &v1.Taint{
Key: legacyapi.TaintNodeUnschedulable,
Key: v1.TaintNodeUnschedulable,
Effect: v1.TaintEffectNoSchedule,
})