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

Move out const strings in pkg/scheduler/api/well_known_labels.go

Browse Source
This commit is contained in:
Wei Huang
2019-11-04 11:31:16 -08:00
parent cbe7c6e3be
commit dd74205bcf
25 changed files with 189 additions and 189 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"
@@ -1520,7 +1519,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,
})

16
pkg/scheduler/algorithm/predicates/predicates_test.go
View File

@@ -31,9 +31,9 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
utilfeature "k8s.io/apiserver/pkg/util/feature"
featuregatetesting "k8s.io/component-base/featuregate/testing"
api "k8s.io/kubernetes/pkg/apis/core"
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
"k8s.io/kubernetes/pkg/features"
legacyapi "k8s.io/kubernetes/pkg/scheduler/api"
fakelisters "k8s.io/kubernetes/pkg/scheduler/listers/fake"
schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo"
nodeinfosnapshot "k8s.io/kubernetes/pkg/scheduler/nodeinfo/snapshot"
@@ -1447,7 +1447,7 @@ func TestPodFitsSelector(t *testing.T) {
{
MatchFields: []v1.NodeSelectorRequirement{
{
Key: legacyapi.NodeFieldSelectorKeyNodeName,
Key: api.ObjectNameField,
Operator: v1.NodeSelectorOpIn,
Values: []string{"node_1"},
},
@@ -1473,7 +1473,7 @@ func TestPodFitsSelector(t *testing.T) {
{
MatchFields: []v1.NodeSelectorRequirement{
{
Key: legacyapi.NodeFieldSelectorKeyNodeName,
Key: api.ObjectNameField,
Operator: v1.NodeSelectorOpIn,
Values: []string{"node_1"},
},
@@ -1499,7 +1499,7 @@ func TestPodFitsSelector(t *testing.T) {
{
MatchFields: []v1.NodeSelectorRequirement{
{
Key: legacyapi.NodeFieldSelectorKeyNodeName,
Key: api.ObjectNameField,
Operator: v1.NodeSelectorOpIn,
Values: []string{"node_1"},
},
@@ -1535,7 +1535,7 @@ func TestPodFitsSelector(t *testing.T) {
{
MatchFields: []v1.NodeSelectorRequirement{
{
Key: legacyapi.NodeFieldSelectorKeyNodeName,
Key: api.ObjectNameField,
Operator: v1.NodeSelectorOpIn,
Values: []string{"node_1"},
},
@@ -1569,7 +1569,7 @@ func TestPodFitsSelector(t *testing.T) {
{
MatchFields: []v1.NodeSelectorRequirement{
{
Key: legacyapi.NodeFieldSelectorKeyNodeName,
Key: api.ObjectNameField,
Operator: v1.NodeSelectorOpIn,
Values: []string{"node_1"},
},
@@ -1603,7 +1603,7 @@ func TestPodFitsSelector(t *testing.T) {
{
MatchFields: []v1.NodeSelectorRequirement{
{
Key: legacyapi.NodeFieldSelectorKeyNodeName,
Key: api.ObjectNameField,
Operator: v1.NodeSelectorOpIn,
Values: []string{"node_1"},
},
@@ -4690,7 +4690,7 @@ func TestCheckNodeUnschedulablePredicate(t *testing.T) {
Spec: v1.PodSpec{
Tolerations: []v1.Toleration{
{
Key: legacyapi.TaintNodeUnschedulable,
Key: v1.TaintNodeUnschedulable,
Effect: v1.TaintEffectNoSchedule,
},
},

4
pkg/scheduler/algorithm/types.go
View File

@@ -23,13 +23,13 @@ import (
appslisters "k8s.io/client-go/listers/apps/v1"
corelisters "k8s.io/client-go/listers/core/v1"
"k8s.io/kubernetes/pkg/apis/apps"
legacyapi "k8s.io/kubernetes/pkg/scheduler/api"
api "k8s.io/kubernetes/pkg/apis/core"
)
// NodeFieldSelectorKeys is a map that: the keys are node field selector keys; the values are
// the functions to get the value of the node field.
var NodeFieldSelectorKeys = map[string]func(*v1.Node) string{
legacyapi.NodeFieldSelectorKeyNodeName: func(n *v1.Node) string { return n.Name },
api.ObjectNameField: func(n *v1.Node) string { return n.Name },
}
var _ corelisters.ReplicationControllerLister = &EmptyControllerLister{}