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

15
pkg/controller/daemon/daemon_controller_test.go
View File

@@ -49,7 +49,6 @@ import (
"k8s.io/kubernetes/pkg/apis/scheduling"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/features"
schedulerapi "k8s.io/kubernetes/pkg/scheduler/api"
"k8s.io/kubernetes/pkg/securitycontext"
labelsutil "k8s.io/kubernetes/pkg/util/labels"
)
@@ -75,13 +74,13 @@ func nowPointer() *metav1.Time {
var (
nodeNotReady = []v1.Taint{{
Key: schedulerapi.TaintNodeNotReady,
Key: v1.TaintNodeNotReady,
Effect: v1.TaintEffectNoExecute,
TimeAdded: nowPointer(),
}}
nodeUnreachable = []v1.Taint{{
Key: schedulerapi.TaintNodeUnreachable,
Key: v1.TaintNodeUnreachable,
Effect: v1.TaintEffectNoExecute,
TimeAdded: nowPointer(),
}}
@@ -528,7 +527,7 @@ func TestSimpleDaemonSetScheduleDaemonSetPodsLaunchesPods(t *testing.T) {
}
field := nodeSelector.NodeSelectorTerms[0].MatchFields[0]
if field.Key == schedulerapi.NodeFieldSelectorKeyNodeName {
if field.Key == api.ObjectNameField {
if field.Operator != v1.NodeSelectorOpIn {
t.Fatalf("the operation of hostname NodeAffinity is not %v", v1.NodeSelectorOpIn)
}
@@ -1517,9 +1516,9 @@ func TestTaintPressureNodeDaemonLaunchesPod(t *testing.T) {
{Type: v1.NodePIDPressure, Status: v1.ConditionTrue},
}
node.Spec.Taints = []v1.Taint{
{Key: schedulerapi.TaintNodeDiskPressure, Effect: v1.TaintEffectNoSchedule},
{Key: schedulerapi.TaintNodeMemoryPressure, Effect: v1.TaintEffectNoSchedule},
{Key: schedulerapi.TaintNodePIDPressure, Effect: v1.TaintEffectNoSchedule},
{Key: v1.TaintNodeDiskPressure, Effect: v1.TaintEffectNoSchedule},
{Key: v1.TaintNodeMemoryPressure, Effect: v1.TaintEffectNoSchedule},
{Key: v1.TaintNodePIDPressure, Effect: v1.TaintEffectNoSchedule},
}
manager.nodeStore.Add(node)
@@ -2161,7 +2160,7 @@ func TestDeleteUnscheduledPodForNotExistingNode(t *testing.T) {
{
MatchFields: []v1.NodeSelectorRequirement{
{
Key: schedulerapi.NodeFieldSelectorKeyNodeName,
Key: api.ObjectNameField,
Operator: v1.NodeSelectorOpIn,
Values: []string{"node-2"},
},