scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 03:38:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #123481 from sanposhiho/mindomain-stable

Browse Source 
graduate MinDomainsInPodTopologySpread to stable
This commit is contained in:
Kubernetes Prow Robot
2024-03-04 17:18:53 -08:00
committed by GitHub
parent f745503112 f46df21cad
commit 6929a11f69
18 changed files with 108 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1363,7 +1363,6 @@ func TestPodTopologySpreadFilter(t *testing.T) {
fits bool
nodes []*v1.Node
candidateNodes []string // nodes expected to schedule onto
enableMinDomains bool
enableNodeInclusionPolicy bool
enableMatchLabelKeys bool
}{
@@ -1483,10 +1482,9 @@ func TestPodTopologySpreadFilter(t *testing.T) {
st.MakePod().ZeroTerminationGracePeriod().Name("p2b").Node("node-2").Label("foo", "").Container(pause).Obj(),
st.MakePod().ZeroTerminationGracePeriod().Name("p3").Node("node-3").Label("foo", "").Container(pause).Obj(),
},
fits: true,
nodes: defaultNodes,
candidateNodes: []string{"node-3"},
enableMinDomains: true,
fits: true,
nodes: defaultNodes,
candidateNodes: []string{"node-3"},
},
{
name: "pods spread across nodes as 2/2/1, maxSkew is 2, and the number of domains > minDomains, then the all nodes fit",
@@ -1510,10 +1508,9 @@ func TestPodTopologySpreadFilter(t *testing.T) {
st.MakePod().ZeroTerminationGracePeriod().Name("p2b").Node("node-2").Label("foo", "").Container(pause).Obj(),
st.MakePod().ZeroTerminationGracePeriod().Name("p3").Node("node-3").Label("foo", "").Container(pause).Obj(),
},
fits: true,
nodes: defaultNodes,
candidateNodes: []string{"node-1", "node-2", "node-3"},
enableMinDomains: true,
fits: true,
nodes: defaultNodes,
candidateNodes: []string{"node-1", "node-2", "node-3"},
},
{
name: "pods spread across zone as 2/1, maxSkew is 2 and the number of domains < minDomains, then the third and fourth nodes fit",
@@ -1533,10 +1530,9 @@ func TestPodTopologySpreadFilter(t *testing.T) {
st.MakePod().Name("p2a").Node("node-1").Label("foo", "").Container(pause).Obj(),
st.MakePod().Name("p3a").Node("node-2").Label("foo", "").Container(pause).Obj(),
},
fits: true,
nodes: defaultNodes,
candidateNodes: []string{"node-2", "node-3"},
enableMinDomains: true,
fits: true,
nodes: defaultNodes,
candidateNodes: []string{"node-2", "node-3"},
},
{
name: "pods spread across zone as 2/1, maxSkew is 2 and the number of domains < minDomains, then the all nodes fit",
@@ -1556,10 +1552,9 @@ func TestPodTopologySpreadFilter(t *testing.T) {
st.MakePod().Name("p2a").Node("node-2").Label("foo", "").Container(pause).Obj(),
st.MakePod().Name("p3a").Node("node-3").Label("foo", "").Container(pause).Obj(),
},
fits: true,
nodes: defaultNodes,
candidateNodes: []string{"node-0", "node-1", "node-2", "node-3"},
enableMinDomains: true,
fits: true,
nodes: defaultNodes,
candidateNodes: []string{"node-0", "node-1", "node-2", "node-3"},
},
{
name: "NodeAffinityPolicy honored with labelSelectors, pods spread across zone as 2/1",
@@ -1772,7 +1767,6 @@ 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.enableNodeInclusionPolicy)()
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.MatchLabelKeysInPodTopologySpread, tt.enableMatchLabelKeys)()