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

typo fixed

Browse Source 
Signed-off-by: kerthcet <kerthcet@gmail.com>
This commit is contained in:
kerthcet
2022-09-29 18:08:15 +08:00
parent ef56451ae5
commit 55dcde737d
4 changed files with 146 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
test/integration/scheduler/filters/filters_test.go
View File

@@ -1068,15 +1068,15 @@ func TestPodTopologySpreadFilter(t *testing.T) {
}
tests := []struct {
name string
incomingPod *v1.Pod
existingPods []*v1.Pod
fits bool
nodes []*v1.Node
candidateNodes []string // nodes expected to schedule onto
enableMinDomains bool
enableNodeInclustionPolicy bool
enableMatchLabelKeys bool
name string
incomingPod *v1.Pod
existingPods []*v1.Pod
fits bool
nodes []*v1.Node
candidateNodes []string // nodes expected to schedule onto
enableMinDomains bool
enableNodeInclusionPolicy bool
enableMatchLabelKeys bool
}{
// note: naming starts at index 0
{
@@ -1291,8 +1291,8 @@ func TestPodTopologySpreadFilter(t *testing.T) {
st.MakeNode().Name("node-3").Label("node", "node-3").Label("zone", "zone-2").Obj(),
st.MakeNode().Name("node-4").Label("node", "node-4").Label("zone", "zone-2").Label("foo", "").Obj(),
},
candidateNodes: []string{"node-4"}, // node-3 is filtered out by NodeAffinity plugin
enableNodeInclustionPolicy: true,
candidateNodes: []string{"node-4"}, // node-3 is filtered out by NodeAffinity plugin
enableNodeInclusionPolicy: true,
},
{
name: "NodeAffinityPolicy ignored with nodeAffinity, pods spread across zone as 1/~2~",
@@ -1312,8 +1312,8 @@ func TestPodTopologySpreadFilter(t *testing.T) {
st.MakeNode().Name("node-3").Label("node", "node-3").Label("zone", "zone-2").Obj(),
st.MakeNode().Name("node-4").Label("node", "node-4").Label("zone", "zone-2").Label("foo", "").Obj(),
},
candidateNodes: []string{"node-1", "node-2"},
enableNodeInclustionPolicy: true,
candidateNodes: []string{"node-1", "node-2"},
enableNodeInclusionPolicy: true,
},
{
name: "NodeTaintsPolicy honored, pods spread across zone as 2/1",
@@ -1333,8 +1333,8 @@ func TestPodTopologySpreadFilter(t *testing.T) {
st.MakeNode().Name("node-3").Label("node", "node-3").Label("zone", "zone-2").Taints(taints).Obj(),
st.MakeNode().Name("node-4").Label("node", "node-4").Label("zone", "zone-2").Label("foo", "").Obj(),
},
candidateNodes: []string{"node-4"}, // node-3 is filtered out by TaintToleration plugin
enableNodeInclustionPolicy: true,
candidateNodes: []string{"node-4"}, // node-3 is filtered out by TaintToleration plugin
enableNodeInclusionPolicy: true,
},
{
name: "NodeTaintsPolicy ignored, pods spread across zone as 2/2",
@@ -1354,8 +1354,8 @@ func TestPodTopologySpreadFilter(t *testing.T) {
st.MakeNode().Name("node-3").Label("node", "node-3").Label("zone", "zone-2").Taints(taints).Obj(),
st.MakeNode().Name("node-4").Label("node", "node-4").Label("zone", "zone-2").Label("foo", "").Obj(),
},
candidateNodes: []string{"node-1", "node-2", "node-4"}, // node-3 is filtered out by TaintToleration plugin
enableNodeInclustionPolicy: true,
candidateNodes: []string{"node-1", "node-2", "node-4"}, // node-3 is filtered out by TaintToleration plugin
enableNodeInclusionPolicy: true,
},
{
// 1. to fulfil "zone" constraint, pods spread across zones as 2/1
@@ -1380,8 +1380,8 @@ func TestPodTopologySpreadFilter(t *testing.T) {
st.MakeNode().Name("node-3").Label("node", "node-3").Label("zone", "zone-2").Obj(),
st.MakeNode().Name("node-4").Label("node", "node-4").Label("zone", "zone-2").Label("foo", "").Obj(),
},
candidateNodes: []string{"node-4"},
enableNodeInclustionPolicy: true,
candidateNodes: []string{"node-4"},
enableNodeInclusionPolicy: true,
},
{
// 1. to fulfil "zone" constraint, pods spread across zones as 2/1
@@ -1406,8 +1406,8 @@ func TestPodTopologySpreadFilter(t *testing.T) {
st.MakeNode().Name("node-3").Label("node", "node-3").Label("zone", "zone-2").Obj(),
st.MakeNode().Name("node-4").Label("node", "node-4").Label("zone", "zone-2").Label("foo", "").Obj(),
},
candidateNodes: []string{"node-4"},
enableNodeInclustionPolicy: false,
candidateNodes: []string{"node-4"},
enableNodeInclusionPolicy: false,
},
{
// 1. to fulfil "zone" constraint, pods spread across zones as 2/2
@@ -1432,8 +1432,8 @@ func TestPodTopologySpreadFilter(t *testing.T) {
st.MakeNode().Name("node-3").Label("node", "node-3").Label("zone", "zone-2").Obj(),
st.MakeNode().Name("node-4").Label("node", "node-4").Label("zone", "zone-2").Label("foo", "").Obj(),
},
candidateNodes: []string{"node-1", "node-4"},
enableNodeInclustionPolicy: true,
candidateNodes: []string{"node-1", "node-4"},
enableNodeInclusionPolicy: true,
},
{
name: "matchLabelKeys ignored when feature gate disabled, pods spread across zone as 2/1",
@@ -1484,7 +1484,7 @@ func TestPodTopologySpreadFilter(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.MinDomainsInPodTopologySpread, tt.enableMinDomains)()
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NodeInclusionPolicyInPodTopologySpread, tt.enableNodeInclustionPolicy)()
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NodeInclusionPolicyInPodTopologySpread, tt.enableNodeInclusionPolicy)()
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.MatchLabelKeysInPodTopologySpread, tt.enableMatchLabelKeys)()
testCtx := initTest(t, "pts-predicate")

26
test/integration/scheduler/scoring/priorities_test.go
View File

@@ -442,14 +442,14 @@ func TestPodTopologySpreadScoring(t *testing.T) {
}
tests := []struct {
name string
incomingPod *v1.Pod
existingPods []*v1.Pod
fits bool
nodes []*v1.Node
want []string // nodes expected to schedule onto
enableNodeInclustionPolicy bool
enableMatchLabelKeys bool
name string
incomingPod *v1.Pod
existingPods []*v1.Pod
fits bool
nodes []*v1.Node
want []string // nodes expected to schedule onto
enableNodeInclusionPolicy bool
enableMatchLabelKeys bool
}{
// note: naming starts at index 0
// the symbol ~X~ means that node is infeasible
@@ -512,8 +512,8 @@ func TestPodTopologySpreadScoring(t *testing.T) {
st.MakeNode().Name("node-3").Label("node", "node-3").Label("zone", "zone-2").Label("foo", "").Obj(),
st.MakeNode().Name("node-4").Label("node", "node-4").Label("zone", "zone-2").Obj(),
},
want: []string{"node-3"},
enableNodeInclustionPolicy: true,
want: []string{"node-3"},
enableNodeInclusionPolicy: true,
},
{
// 1. to fulfil "zone" constraint, pods spread across zones as ~3~/~1~
@@ -538,8 +538,8 @@ func TestPodTopologySpreadScoring(t *testing.T) {
st.MakeNode().Name("node-3").Label("node", "node-3").Label("zone", "zone-2").Label("foo", "").Obj(),
st.MakeNode().Name("node-4").Label("node", "node-4").Label("zone", "zone-2").Obj(),
},
want: []string{"node-3"},
enableNodeInclustionPolicy: true,
want: []string{"node-3"},
enableNodeInclusionPolicy: true,
},
{
name: "matchLabelKeys ignored when feature gate disabled, node-1 is the preferred fit",
@@ -598,7 +598,7 @@ func TestPodTopologySpreadScoring(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NodeInclusionPolicyInPodTopologySpread, tt.enableNodeInclustionPolicy)()
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NodeInclusionPolicyInPodTopologySpread, tt.enableNodeInclusionPolicy)()
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.MatchLabelKeysInPodTopologySpread, tt.enableMatchLabelKeys)()
testCtx := initTestSchedulerForPriorityTest(t, podtopologyspread.Name)