github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-12 13:31:52 +00:00
Code Issues Projects Releases Wiki Activity

graduate MinDomainsInPodTopologySpread to stable

Browse Source
This commit is contained in:
Kensei Nakada 2024-02-24 08:00:34 +00:00
parent 781da75951
commit 58a826a59a
10 changed files with 103 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/api/pod/util.go
View File

@ -565,7 +565,6 @@ func dropDisabledFields(
dropDisabledProcMountField(podSpec, oldPodSpec) dropDisabledProcMountField(podSpec, oldPodSpec)
dropDisabledTopologySpreadConstraintsFields(podSpec, oldPodSpec)
dropDisabledNodeInclusionPolicyFields(podSpec, oldPodSpec) dropDisabledNodeInclusionPolicyFields(podSpec, oldPodSpec)
dropDisabledMatchLabelKeysFieldInTopologySpread(podSpec, oldPodSpec) dropDisabledMatchLabelKeysFieldInTopologySpread(podSpec, oldPodSpec)
dropDisabledMatchLabelKeysFieldInPodAffinity(podSpec, oldPodSpec) dropDisabledMatchLabelKeysFieldInPodAffinity(podSpec, oldPodSpec)
@ -743,33 +742,6 @@ func dropEphemeralResourceClaimRequests(containers []api.EphemeralContainer) {
} }
} }
// dropDisabledTopologySpreadConstraintsFields removes disabled fields from PodSpec related
// to TopologySpreadConstraints only if it is not already used by the old spec.
func dropDisabledTopologySpreadConstraintsFields(podSpec, oldPodSpec *api.PodSpec) {
if !utilfeature.DefaultFeatureGate.Enabled(features.MinDomainsInPodTopologySpread) &&
!minDomainsInUse(oldPodSpec) &&
podSpec != nil {
for i := range podSpec.TopologySpreadConstraints {
podSpec.TopologySpreadConstraints[i].MinDomains = nil
}
}
}
// minDomainsInUse returns true if the pod spec is non-nil
// and has non-nil MinDomains field in TopologySpreadConstraints.
func minDomainsInUse(podSpec *api.PodSpec) bool {
if podSpec == nil {
return false
}
for _, c := range podSpec.TopologySpreadConstraints {
if c.MinDomains != nil {
return true
}
}
return false
}
// dropDisabledProcMountField removes disabled fields from PodSpec related // dropDisabledProcMountField removes disabled fields from PodSpec related
// to ProcMount only if it is not already used by the old spec // to ProcMount only if it is not already used by the old spec
func dropDisabledProcMountField(podSpec, oldPodSpec *api.PodSpec) { func dropDisabledProcMountField(podSpec, oldPodSpec *api.PodSpec) {

167
pkg/api/pod/util_test.go
View File

@ -998,173 +998,6 @@ func TestValidatePodDeletionCostOption(t *testing.T) {
} }
} }
func TestDropDisabledTopologySpreadConstraintsFields(t *testing.T) {
testCases := []struct {
name string
enabled bool
podSpec *api.PodSpec
oldPodSpec *api.PodSpec
wantPodSpec *api.PodSpec
}{
{
name: "TopologySpreadConstraints is nil",
podSpec: &api.PodSpec{},
oldPodSpec: &api.PodSpec{},
wantPodSpec: &api.PodSpec{},
},
{
name: "TopologySpreadConstraints is empty",
podSpec: &api.PodSpec{TopologySpreadConstraints: []api.TopologySpreadConstraint{}},
oldPodSpec: &api.PodSpec{TopologySpreadConstraints: []api.TopologySpreadConstraint{}},
wantPodSpec: &api.PodSpec{TopologySpreadConstraints: []api.TopologySpreadConstraint{}},
},
{
name: "TopologySpreadConstraints is not empty, but all constraints don't have minDomains",
podSpec: &api.PodSpec{TopologySpreadConstraints: []api.TopologySpreadConstraint{
{
MinDomains: nil,
},
{
MinDomains: nil,
},
}},
oldPodSpec: &api.PodSpec{TopologySpreadConstraints: []api.TopologySpreadConstraint{
{
MinDomains: nil,
},
{
MinDomains: nil,
},
}},
wantPodSpec: &api.PodSpec{TopologySpreadConstraints: []api.TopologySpreadConstraint{
{
MinDomains: nil,
},
{
MinDomains: nil,
},
}},
},
{
name: "one constraint in podSpec has non-empty minDomains, feature gate is disabled " +
"and all constraint in oldPodSpec doesn't have minDomains",
enabled: false,
podSpec: &api.PodSpec{
TopologySpreadConstraints: []api.TopologySpreadConstraint{
{
MinDomains: pointer.Int32(2),
},
{
MinDomains: nil,
},
},
},
oldPodSpec: &api.PodSpec{
TopologySpreadConstraints: []api.TopologySpreadConstraint{
{
MinDomains: nil,
},
{
MinDomains: nil,
},
},
},
wantPodSpec: &api.PodSpec{
TopologySpreadConstraints: []api.TopologySpreadConstraint{
{
// cleared.
MinDomains: nil,
},
{
MinDomains: nil,
},
},
},
},
{
name: "one constraint in podSpec has non-empty minDomains, feature gate is disabled " +
"and one constraint in oldPodSpec has minDomains",
enabled: false,
podSpec: &api.PodSpec{
TopologySpreadConstraints: []api.TopologySpreadConstraint{
{
MinDomains: pointer.Int32(2),
},
{
MinDomains: nil,
},
},
},
oldPodSpec: &api.PodSpec{
TopologySpreadConstraints: []api.TopologySpreadConstraint{
{
MinDomains: pointer.Int32(2),
},
{
MinDomains: nil,
},
},
},
wantPodSpec: &api.PodSpec{
TopologySpreadConstraints: []api.TopologySpreadConstraint{
{
// not cleared.
MinDomains: pointer.Int32(2),
},
{
MinDomains: nil,
},
},
},
},
{
name: "one constraint in podSpec has non-empty minDomains, feature gate is enabled" +
"and all constraint in oldPodSpec doesn't have minDomains",
enabled: true,
podSpec: &api.PodSpec{
TopologySpreadConstraints: []api.TopologySpreadConstraint{
{
MinDomains: pointer.Int32(2),
},
{
MinDomains: nil,
},
},
},
oldPodSpec: &api.PodSpec{
TopologySpreadConstraints: []api.TopologySpreadConstraint{
{
MinDomains: nil,
},
{
MinDomains: nil,
},
},
},
wantPodSpec: &api.PodSpec{
TopologySpreadConstraints: []api.TopologySpreadConstraint{
{
// not cleared.
MinDomains: pointer.Int32(2),
},
{
MinDomains: nil,
},
},
},
},
}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.MinDomainsInPodTopologySpread, tc.enabled)()
dropDisabledFields(tc.podSpec, nil, tc.oldPodSpec, nil)
if diff := cmp.Diff(tc.wantPodSpec, tc.podSpec); diff != "" {
t.Errorf("unexpected pod spec (-want, +got):\n%s", diff)
}
})
}
}
func TestDropDisabledPodStatusFields(t *testing.T) { func TestDropDisabledPodStatusFields(t *testing.T) {
podWithHostIPs := func() *api.PodStatus { podWithHostIPs := func() *api.PodStatus {
return &api.PodStatus{ return &api.PodStatus{

3
pkg/features/kube_features.go
View File

@ -495,6 +495,7 @@ const (
// kep: https://kep.k8s.io/3022 // kep: https://kep.k8s.io/3022
// alpha: v1.24 // alpha: v1.24
// beta: v1.25 // beta: v1.25
// GA: v1.30
// //
// Enable MinDomains in Pod Topology Spread. // Enable MinDomains in Pod Topology Spread.
MinDomainsInPodTopologySpread featuregate.Feature = "MinDomainsInPodTopologySpread" MinDomainsInPodTopologySpread featuregate.Feature = "MinDomainsInPodTopologySpread"
@ -1052,7 +1053,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
MemoryQoS: {Default: false, PreRelease: featuregate.Alpha}, MemoryQoS: {Default: false, PreRelease: featuregate.Alpha},
MinDomainsInPodTopologySpread: {Default: true, PreRelease: featuregate.Beta}, MinDomainsInPodTopologySpread: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.32
MultiCIDRServiceAllocator: {Default: false, PreRelease: featuregate.Alpha}, MultiCIDRServiceAllocator: {Default: false, PreRelease: featuregate.Alpha},

1
pkg/scheduler/framework/plugins/feature/feature.go
View File

@ -22,7 +22,6 @@ package feature
type Features struct { type Features struct {
EnableDynamicResourceAllocation bool EnableDynamicResourceAllocation bool
EnableVolumeCapacityPriority bool EnableVolumeCapacityPriority bool
EnableMinDomainsInPodTopologySpread bool
EnableNodeInclusionPolicyInPodTopologySpread bool EnableNodeInclusionPolicyInPodTopologySpread bool
EnableMatchLabelKeysInPodTopologySpread bool EnableMatchLabelKeysInPodTopologySpread bool
EnablePodSchedulingReadiness bool EnablePodSchedulingReadiness bool

6
pkg/scheduler/framework/plugins/podtopologyspread/common.go
View File

@ -24,6 +24,7 @@ import (
"k8s.io/component-helpers/scheduling/corev1/nodeaffinity" "k8s.io/component-helpers/scheduling/corev1/nodeaffinity"
"k8s.io/kubernetes/pkg/scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/helper" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/helper"
"k8s.io/utils/ptr"
) )
type topologyPair struct { type topologyPair struct {
@ -112,13 +113,10 @@ func (pl *PodTopologySpread) filterTopologySpreadConstraints(constraints []v1.To
MaxSkew: c.MaxSkew, MaxSkew: c.MaxSkew,
TopologyKey: c.TopologyKey, TopologyKey: c.TopologyKey,
Selector: selector, Selector: selector,
MinDomains: 1, // If MinDomains is nil, we treat MinDomains as 1. MinDomains: ptr.Deref(c.MinDomains, 1), // If MinDomains is nil, we treat MinDomains as 1.
NodeAffinityPolicy: v1.NodeInclusionPolicyHonor, // If NodeAffinityPolicy is nil, we treat NodeAffinityPolicy as "Honor". NodeAffinityPolicy: v1.NodeInclusionPolicyHonor, // If NodeAffinityPolicy is nil, we treat NodeAffinityPolicy as "Honor".
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, // If NodeTaintsPolicy is nil, we treat NodeTaintsPolicy as "Ignore". NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, // If NodeTaintsPolicy is nil, we treat NodeTaintsPolicy as "Ignore".
} }
if pl.enableMinDomainsInPodTopologySpread && c.MinDomains != nil {
tsc.MinDomains = *c.MinDomains
}
if pl.enableNodeInclusionPolicyInPodTopologySpread { if pl.enableNodeInclusionPolicyInPodTopologySpread {
if c.NodeAffinityPolicy != nil { if c.NodeAffinityPolicy != nil {
tsc.NodeAffinityPolicy = *c.NodeAffinityPolicy tsc.NodeAffinityPolicy = *c.NodeAffinityPolicy

16
pkg/scheduler/framework/plugins/podtopologyspread/filtering.go
View File

@ -51,17 +51,13 @@ type preFilterState struct {
} }
// minMatchNum returns the global minimum for the calculation of skew while taking MinDomains into account. // minMatchNum returns the global minimum for the calculation of skew while taking MinDomains into account.
func (s *preFilterState) minMatchNum(tpKey string, minDomains int32, enableMinDomainsInPodTopologySpread bool) (int, error) { func (s *preFilterState) minMatchNum(tpKey string, minDomains int32) (int, error) {
paths, ok := s.TpKeyToCriticalPaths[tpKey] paths, ok := s.TpKeyToCriticalPaths[tpKey]
if !ok { if !ok {
return 0, fmt.Errorf("failed to retrieve path by topology key") return 0, fmt.Errorf("failed to retrieve path by topology key")
} }
minMatchNum := paths[0].MatchNum minMatchNum := paths[0].MatchNum
if !enableMinDomainsInPodTopologySpread {
return minMatchNum, nil
}
domainsNum, ok := s.TpKeyToDomainsNum[tpKey] domainsNum, ok := s.TpKeyToDomainsNum[tpKey]
if !ok { if !ok {
return 0, fmt.Errorf("failed to retrieve the number of domains by topology key") return 0, fmt.Errorf("failed to retrieve the number of domains by topology key")
@ -296,11 +292,9 @@ func (pl *PodTopologySpread) calPreFilterState(ctx context.Context, pod *v1.Pod)
s.TpPairToMatchNum[tp] += count s.TpPairToMatchNum[tp] += count
} }
} }
if pl.enableMinDomainsInPodTopologySpread { s.TpKeyToDomainsNum = make(map[string]int, len(constraints))
s.TpKeyToDomainsNum = make(map[string]int, len(constraints)) for tp := range s.TpPairToMatchNum {
for tp := range s.TpPairToMatchNum { s.TpKeyToDomainsNum[tp.key]++
s.TpKeyToDomainsNum[tp.key]++
}
} }
// calculate min match for each topology pair // calculate min match for each topology pair
@ -341,7 +335,7 @@ func (pl *PodTopologySpread) Filter(ctx context.Context, cycleState *framework.C
// judging criteria: // judging criteria:
// 'existing matching num' + 'if self-match (1 or 0)' - 'global minimum' <= 'maxSkew' // 'existing matching num' + 'if self-match (1 or 0)' - 'global minimum' <= 'maxSkew'
minMatchNum, err := s.minMatchNum(tpKey, c.MinDomains, pl.enableMinDomainsInPodTopologySpread) minMatchNum, err := s.minMatchNum(tpKey, c.MinDomains)
if err != nil { if err != nil {
logger.Error(err, "Internal error occurred while retrieving value precalculated in PreFilter", "topologyKey", tpKey, "paths", s.TpKeyToCriticalPaths) logger.Error(err, "Internal error occurred while retrieving value precalculated in PreFilter", "topologyKey", tpKey, "paths", s.TpKeyToCriticalPaths)
continue continue

112
pkg/scheduler/framework/plugins/podtopologyspread/filtering_test.go
View File

@ -68,7 +68,6 @@ func (p *criticalPaths) sort() {
} }
func TestPreFilterState(t *testing.T) { func TestPreFilterState(t *testing.T) {
tests := []struct { tests := []struct {
name string name string
pod *v1.Pod pod *v1.Pod
@ -78,7 +77,6 @@ func TestPreFilterState(t *testing.T) {
defaultConstraints []v1.TopologySpreadConstraint defaultConstraints []v1.TopologySpreadConstraint
want *preFilterState want *preFilterState
wantPrefilterStatus *framework.Status wantPrefilterStatus *framework.Status
enableMinDomains bool
enableNodeInclusionPolicy bool enableNodeInclusionPolicy bool
enableMatchLabelKeys bool enableMatchLabelKeys bool
}{ }{
@ -104,6 +102,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"zone": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone1", 0}, {"zone2", 0}}, "zone": {{"zone1", 0}, {"zone2", 0}},
}, },
@ -142,6 +141,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"zone": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone2", 2}, {"zone1", 3}}, "zone": {{"zone2", 2}, {"zone1", 3}},
}, },
@ -180,6 +180,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"zone": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone2", 0}, {"zone1", 0}}, "zone": {{"zone2", 0}, {"zone1", 0}},
}, },
@ -220,6 +221,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"zone": 3},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone3", 0}, {"zone2", 2}}, "zone": {{"zone3", 0}, {"zone2", 2}},
}, },
@ -259,6 +261,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"zone": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone2", 1}, {"zone1", 2}}, "zone": {{"zone2", 1}, {"zone1", 2}},
}, },
@ -308,6 +311,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"zone": 2, "node": 4},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone1", 3}, {"zone2", 4}}, "zone": {{"zone1", 3}, {"zone2", 4}},
"node": {{"node-x", 0}, {"node-b", 1}}, "node": {{"node-x", 0}, {"node-b", 1}},
@ -363,6 +367,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"zone": 2, "node": 3},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone1", 3}, {"zone2", 4}}, "zone": {{"zone1", 3}, {"zone2", 4}},
"node": {{"node-b", 1}, {"node-a", 2}}, "node": {{"node-b", 1}, {"node-a", 2}},
@ -410,6 +415,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"zone": 2, "node": 3},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone2", 0}, {"zone1", 1}}, "zone": {{"zone2", 0}, {"zone1", 1}},
"node": {{"node-a", 0}, {"node-y", 0}}, "node": {{"node-a", 0}, {"node-y", 0}},
@ -462,6 +468,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"zone": 2, "node": 3},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone1", 3}, {"zone2", 4}}, "zone": {{"zone1", 3}, {"zone2", 4}},
"node": {{"node-b", 0}, {"node-a", 1}}, "node": {{"node-b", 0}, {"node-a", 1}},
@ -516,6 +523,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"zone": 2, "node": 3},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone1", 3}, {"zone2", 4}}, "zone": {{"zone1", 3}, {"zone2", 4}},
"node": {{"node-b", 1}, {"node-a", 2}}, "node": {{"node-b", 1}, {"node-a", 2}},
@ -559,6 +567,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"node": newCriticalPaths(), "node": newCriticalPaths(),
"rack": newCriticalPaths(), "rack": newCriticalPaths(),
@ -600,6 +609,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": newCriticalPaths(), "zone": newCriticalPaths(),
}, },
@ -638,7 +648,6 @@ func TestPreFilterState(t *testing.T) {
st.MakePod().Name("p-y3").Node("node-y").Label("foo", "").Obj(), st.MakePod().Name("p-y3").Node("node-y").Label("foo", "").Obj(),
st.MakePod().Name("p-y4").Node("node-y").Label("foo", "").Obj(), st.MakePod().Name("p-y4").Node("node-y").Label("foo", "").Obj(),
}, },
enableMinDomains: true,
want: &preFilterState{ want: &preFilterState{
Constraints: []topologySpreadConstraint{ Constraints: []topologySpreadConstraint{
{ {
@ -704,6 +713,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"node": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"node": {{"node-a", 1}, {"node-b", 2}}, "node": {{"node-a", 1}, {"node-b", 2}},
}, },
@ -742,6 +752,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"node": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"node": {{"node-a", 1}, {"node-b", 2}}, "node": {{"node-a", 1}, {"node-b", 2}},
}, },
@ -780,6 +791,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"node": 3},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"node": {{"node-c", 0}, {"node-a", 1}}, "node": {{"node-c", 0}, {"node-a", 1}},
}, },
@ -819,6 +831,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"node": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"node": {{"node-a", 1}, {"node-b", 2}}, "node": {{"node-a", 1}, {"node-b", 2}},
}, },
@ -857,6 +870,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"node": 3},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"node": {{"node-c", 0}, {"node-a", 1}}, "node": {{"node-c", 0}, {"node-a", 1}},
}, },
@ -895,6 +909,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"node": 3},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"node": {{"node-c", 0}, {"node-a", 1}}, "node": {{"node-c", 0}, {"node-a", 1}},
}, },
@ -933,6 +948,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"node": 3},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"node": {{"node-c", 0}, {"node-a", 1}}, "node": {{"node-c", 0}, {"node-a", 1}},
}, },
@ -971,6 +987,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyHonor, NodeTaintsPolicy: v1.NodeInclusionPolicyHonor,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"node": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"node": {{"node-a", 1}, {"node-b", 2}}, "node": {{"node-a", 1}, {"node-b", 2}},
}, },
@ -1009,6 +1026,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyHonor, NodeTaintsPolicy: v1.NodeInclusionPolicyHonor,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"node": 3},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"node": {{"node-c", 0}, {"node-a", 1}}, "node": {{"node-c", 0}, {"node-a", 1}},
}, },
@ -1056,6 +1074,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"zone": 2, "node": 3},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone1", 0}, {"zone2", 1}}, "zone": {{"zone1", 0}, {"zone2", 1}},
"node": {{"node-a", 0}, {"node-x", 1}}, "node": {{"node-a", 0}, {"node-x", 1}},
@ -1105,6 +1124,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"zone": 2, "node": 3},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone1", 0}, {"zone2", 1}}, "zone": {{"zone1", 0}, {"zone2", 1}},
"node": {{"node-a", 0}, {"node-x", 1}}, "node": {{"node-a", 0}, {"node-x", 1}},
@ -1157,6 +1177,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"zone": 2, "node": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone1", 0}, {"zone2", 1}}, "zone": {{"zone1", 0}, {"zone2", 1}},
"node": {{"node-b", 0}, {"node-x", 1}}, "node": {{"node-b", 0}, {"node-x", 1}},
@ -1209,6 +1230,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyHonor, NodeTaintsPolicy: v1.NodeInclusionPolicyHonor,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"zone": 2, "node": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone1", 2}, {"zone2", 3}}, "zone": {{"zone1", 2}, {"zone2", 3}},
"node": {{"node-y", 1}, {"node-x", 2}}, "node": {{"node-y", 1}, {"node-x", 2}},
@ -1251,6 +1273,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"zone": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone2", 2}, {"zone1", 3}}, "zone": {{"zone2", 2}, {"zone1", 3}},
}, },
@ -1290,6 +1313,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"zone": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone2", 1}, {"zone1", 1}}, "zone": {{"zone2", 1}, {"zone1", 1}},
}, },
@ -1329,6 +1353,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"zone": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone2", 2}, {"zone1", 3}}, "zone": {{"zone2", 2}, {"zone1", 3}},
}, },
@ -1368,6 +1393,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"zone": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone2", 0}, {"zone1", 0}}, "zone": {{"zone2", 0}, {"zone1", 0}},
}, },
@ -1407,6 +1433,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"zone": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone2", 0}, {"zone1", 0}}, "zone": {{"zone2", 0}, {"zone1", 0}},
}, },
@ -1445,6 +1472,7 @@ func TestPreFilterState(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"zone": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone2", 2}, {"zone1", 3}}, "zone": {{"zone2", 2}, {"zone1", 3}},
}, },
@ -1475,7 +1503,6 @@ func TestPreFilterState(t *testing.T) {
} }
p := plugintesting.SetupPluginWithInformers(ctx, t, topologySpreadFunc, args, cache.NewSnapshot(tt.existingPods, tt.nodes), tt.objs) p := plugintesting.SetupPluginWithInformers(ctx, t, topologySpreadFunc, args, cache.NewSnapshot(tt.existingPods, tt.nodes), tt.objs)
p.(*PodTopologySpread).enableMinDomainsInPodTopologySpread = tt.enableMinDomains
p.(*PodTopologySpread).enableNodeInclusionPolicyInPodTopologySpread = tt.enableNodeInclusionPolicy p.(*PodTopologySpread).enableNodeInclusionPolicyInPodTopologySpread = tt.enableNodeInclusionPolicy
p.(*PodTopologySpread).enableMatchLabelKeysInPodTopologySpread = tt.enableMatchLabelKeys p.(*PodTopologySpread).enableMatchLabelKeysInPodTopologySpread = tt.enableMatchLabelKeys
@ -1534,7 +1561,8 @@ func TestPreFilterStateAddPod(t *testing.T) {
st.MakeNode().Name("node-b").Label("zone", "zone1").Label("node", "node-b").Obj(), st.MakeNode().Name("node-b").Label("zone", "zone1").Label("node", "node-b").Obj(),
}, },
want: &preFilterState{ want: &preFilterState{
Constraints: []topologySpreadConstraint{nodeConstraint}, Constraints: []topologySpreadConstraint{nodeConstraint},
TpKeyToDomainsNum: map[string]int{"node": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"node": {{"node-b", 0}, {"node-a", 1}}, "node": {{"node-b", 0}, {"node-a", 1}},
}, },
@ -1559,7 +1587,8 @@ func TestPreFilterStateAddPod(t *testing.T) {
st.MakeNode().Name("node-b").Label("zone", "zone1").Label("node", "node-b").Obj(), st.MakeNode().Name("node-b").Label("zone", "zone1").Label("node", "node-b").Obj(),
}, },
want: &preFilterState{ want: &preFilterState{
Constraints: []topologySpreadConstraint{nodeConstraint}, Constraints: []topologySpreadConstraint{nodeConstraint},
TpKeyToDomainsNum: map[string]int{"node": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"node": {{"node-a", 1}, {"node-b", 1}}, "node": {{"node-a", 1}, {"node-b", 1}},
}, },
@ -1584,7 +1613,8 @@ func TestPreFilterStateAddPod(t *testing.T) {
st.MakeNode().Name("node-b").Label("zone", "zone1").Label("node", "node-b").Obj(), st.MakeNode().Name("node-b").Label("zone", "zone1").Label("node", "node-b").Obj(),
}, },
want: &preFilterState{ want: &preFilterState{
Constraints: []topologySpreadConstraint{nodeConstraint}, Constraints: []topologySpreadConstraint{nodeConstraint},
TpKeyToDomainsNum: map[string]int{"node": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"node": {{"node-a", 0}, {"node-b", 1}}, "node": {{"node-a", 0}, {"node-b", 1}},
}, },
@ -1609,7 +1639,8 @@ func TestPreFilterStateAddPod(t *testing.T) {
st.MakeNode().Name("node-b").Label("zone", "zone1").Label("node", "node-b").Obj(), st.MakeNode().Name("node-b").Label("zone", "zone1").Label("node", "node-b").Obj(),
}, },
want: &preFilterState{ want: &preFilterState{
Constraints: []topologySpreadConstraint{nodeConstraint}, Constraints: []topologySpreadConstraint{nodeConstraint},
TpKeyToDomainsNum: map[string]int{"node": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"node": {{"node-a", 0}, {"node-b", 2}}, "node": {{"node-a", 0}, {"node-b", 2}},
}, },
@ -1633,7 +1664,8 @@ func TestPreFilterStateAddPod(t *testing.T) {
st.MakeNode().Name("node-x").Label("zone", "zone2").Label("node", "node-x").Obj(), st.MakeNode().Name("node-x").Label("zone", "zone2").Label("node", "node-x").Obj(),
}, },
want: &preFilterState{ want: &preFilterState{
Constraints: []topologySpreadConstraint{zoneConstraint, nodeConstraint}, Constraints: []topologySpreadConstraint{zoneConstraint, nodeConstraint},
TpKeyToDomainsNum: map[string]int{"zone": 2, "node": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone2", 0}, {"zone1", 1}}, "zone": {{"zone2", 0}, {"zone1", 1}},
"node": {{"node-x", 0}, {"node-a", 1}}, "node": {{"node-x", 0}, {"node-a", 1}},
@ -1662,7 +1694,8 @@ func TestPreFilterStateAddPod(t *testing.T) {
st.MakeNode().Name("node-x").Label("zone", "zone2").Label("node", "node-x").Obj(), st.MakeNode().Name("node-x").Label("zone", "zone2").Label("node", "node-x").Obj(),
}, },
want: &preFilterState{ want: &preFilterState{
Constraints: []topologySpreadConstraint{zoneConstraint, nodeConstraint}, Constraints: []topologySpreadConstraint{zoneConstraint, nodeConstraint},
TpKeyToDomainsNum: map[string]int{"zone": 2, "node": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone1", 1}, {"zone2", 1}}, "zone": {{"zone1", 1}, {"zone2", 1}},
"node": {{"node-a", 1}, {"node-x", 1}}, "node": {{"node-a", 1}, {"node-x", 1}},
@ -1694,7 +1727,8 @@ func TestPreFilterStateAddPod(t *testing.T) {
st.MakeNode().Name("node-x").Label("zone", "zone2").Label("node", "node-x").Obj(), st.MakeNode().Name("node-x").Label("zone", "zone2").Label("node", "node-x").Obj(),
}, },
want: &preFilterState{ want: &preFilterState{
Constraints: []topologySpreadConstraint{zoneConstraint, nodeConstraint}, Constraints: []topologySpreadConstraint{zoneConstraint, nodeConstraint},
TpKeyToDomainsNum: map[string]int{"zone": 2, "node": 3},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone2", 1}, {"zone1", 3}}, "zone": {{"zone2", 1}, {"zone1", 3}},
"node": {{"node-a", 1}, {"node-x", 1}}, "node": {{"node-a", 1}, {"node-x", 1}},
@ -1738,6 +1772,7 @@ func TestPreFilterStateAddPod(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"zone": 2, "node": 3},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone2", 1}, {"zone1", 2}}, "zone": {{"zone2", 1}, {"zone1", 2}},
"node": {{"node-a", 0}, {"node-b", 1}}, "node": {{"node-a", 0}, {"node-b", 1}},
@ -1781,6 +1816,7 @@ func TestPreFilterStateAddPod(t *testing.T) {
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore,
}, },
}, },
TpKeyToDomainsNum: map[string]int{"zone": 2, "node": 3},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone1", 1}, {"zone2", 1}}, "zone": {{"zone1", 1}, {"zone2", 1}},
"node": {{"node-a", 1}, {"node-b", 1}}, "node": {{"node-a", 1}, {"node-b", 1}},
@ -1810,7 +1846,8 @@ func TestPreFilterStateAddPod(t *testing.T) {
st.MakeNode().Name("node-b").Label("zone", "zone2").Label("node", "node-b").Label("foo", "").Obj(), st.MakeNode().Name("node-b").Label("zone", "zone2").Label("node", "node-b").Label("foo", "").Obj(),
}, },
want: &preFilterState{ want: &preFilterState{
Constraints: []topologySpreadConstraint{zoneConstraint}, Constraints: []topologySpreadConstraint{zoneConstraint},
TpKeyToDomainsNum: map[string]int{"zone": 1},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone2", 1}, {MatchNum: math.MaxInt32}}, "zone": {{"zone2", 1}, {MatchNum: math.MaxInt32}},
}, },
@ -1836,7 +1873,8 @@ func TestPreFilterStateAddPod(t *testing.T) {
st.MakeNode().Name("node-b").Label("zone", "zone2").Label("node", "node-b").Label("foo", "").Obj(), st.MakeNode().Name("node-b").Label("zone", "zone2").Label("node", "node-b").Label("foo", "").Obj(),
}, },
want: &preFilterState{ want: &preFilterState{
Constraints: []topologySpreadConstraint{zoneConstraint}, Constraints: []topologySpreadConstraint{zoneConstraint},
TpKeyToDomainsNum: map[string]int{"zone": 1},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone2", 1}, {MatchNum: math.MaxInt32}}, "zone": {{"zone2", 1}, {MatchNum: math.MaxInt32}},
}, },
@ -1862,7 +1900,8 @@ func TestPreFilterStateAddPod(t *testing.T) {
st.MakeNode().Name("node-b").Label("zone", "zone2").Label("node", "node-b").Label("foo", "").Obj(), st.MakeNode().Name("node-b").Label("zone", "zone2").Label("node", "node-b").Label("foo", "").Obj(),
}, },
want: &preFilterState{ want: &preFilterState{
Constraints: []topologySpreadConstraint{zoneConstraint}, Constraints: []topologySpreadConstraint{zoneConstraint},
TpKeyToDomainsNum: map[string]int{"zone": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone1", 1}, {"zone2", 2}}, "zone": {{"zone1", 1}, {"zone2", 2}},
}, },
@ -1889,7 +1928,8 @@ func TestPreFilterStateAddPod(t *testing.T) {
st.MakeNode().Name("node-b").Label("zone", "zone2").Label("node", "node-b").Label("foo", "").Obj(), st.MakeNode().Name("node-b").Label("zone", "zone2").Label("node", "node-b").Label("foo", "").Obj(),
}, },
want: &preFilterState{ want: &preFilterState{
Constraints: []topologySpreadConstraint{zoneConstraint}, Constraints: []topologySpreadConstraint{zoneConstraint},
TpKeyToDomainsNum: map[string]int{"zone": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone1", 1}, {"zone2", 2}}, "zone": {{"zone1", 1}, {"zone2", 2}},
}, },
@ -1916,7 +1956,8 @@ func TestPreFilterStateAddPod(t *testing.T) {
st.MakeNode().Name("node-b").Label("zone", "zone2").Label("node", "node-b").Label("foo", "").Obj(), st.MakeNode().Name("node-b").Label("zone", "zone2").Label("node", "node-b").Label("foo", "").Obj(),
}, },
want: &preFilterState{ want: &preFilterState{
Constraints: []topologySpreadConstraint{zoneConstraint}, Constraints: []topologySpreadConstraint{zoneConstraint},
TpKeyToDomainsNum: map[string]int{"zone": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone1", 1}, {"zone2", 1}}, "zone": {{"zone1", 1}, {"zone2", 1}},
}, },
@ -1943,7 +1984,8 @@ func TestPreFilterStateAddPod(t *testing.T) {
st.MakeNode().Name("node-b").Label("zone", "zone2").Label("node", "node-b").Obj(), st.MakeNode().Name("node-b").Label("zone", "zone2").Label("node", "node-b").Obj(),
}, },
want: &preFilterState{ want: &preFilterState{
Constraints: []topologySpreadConstraint{zoneConstraint}, Constraints: []topologySpreadConstraint{zoneConstraint},
TpKeyToDomainsNum: map[string]int{"zone": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone1", 1}, {"zone2", 2}}, "zone": {{"zone1", 1}, {"zone2", 2}},
}, },
@ -1970,7 +2012,8 @@ func TestPreFilterStateAddPod(t *testing.T) {
st.MakeNode().Name("node-b").Label("zone", "zone2").Label("node", "node-b").Obj(), st.MakeNode().Name("node-b").Label("zone", "zone2").Label("node", "node-b").Obj(),
}, },
want: &preFilterState{ want: &preFilterState{
Constraints: []topologySpreadConstraint{zoneConstraint}, Constraints: []topologySpreadConstraint{zoneConstraint},
TpKeyToDomainsNum: map[string]int{"zone": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone1", 1}, {"zone2", 2}}, "zone": {{"zone1", 1}, {"zone2", 2}},
}, },
@ -2054,7 +2097,8 @@ func TestPreFilterStateRemovePod(t *testing.T) {
deletedPodIdx: 0, // remove pod "p-a1" deletedPodIdx: 0, // remove pod "p-a1"
nodeIdx: 0, // node-a nodeIdx: 0, // node-a
want: &preFilterState{ want: &preFilterState{
Constraints: []topologySpreadConstraint{zoneConstraint}, Constraints: []topologySpreadConstraint{zoneConstraint},
TpKeyToDomainsNum: map[string]int{"zone": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone1", 1}, {"zone2", 1}}, "zone": {{"zone1", 1}, {"zone2", 1}},
}, },
@ -2084,7 +2128,8 @@ func TestPreFilterStateRemovePod(t *testing.T) {
deletedPodIdx: 0, // remove pod "p-a1" deletedPodIdx: 0, // remove pod "p-a1"
nodeIdx: 0, // node-a nodeIdx: 0, // node-a
want: &preFilterState{ want: &preFilterState{
Constraints: []topologySpreadConstraint{zoneConstraint}, Constraints: []topologySpreadConstraint{zoneConstraint},
TpKeyToDomainsNum: map[string]int{"zone": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone1", 1}, {"zone2", 2}}, "zone": {{"zone1", 1}, {"zone2", 2}},
}, },
@ -2115,7 +2160,8 @@ func TestPreFilterStateRemovePod(t *testing.T) {
deletedPodIdx: 0, // remove pod "p-a0" deletedPodIdx: 0, // remove pod "p-a0"
nodeIdx: 0, // node-a nodeIdx: 0, // node-a
want: &preFilterState{ want: &preFilterState{
Constraints: []topologySpreadConstraint{zoneConstraint}, Constraints: []topologySpreadConstraint{zoneConstraint},
TpKeyToDomainsNum: map[string]int{"zone": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone1", 2}, {"zone2", 2}}, "zone": {{"zone1", 2}, {"zone2", 2}},
}, },
@ -2146,7 +2192,8 @@ func TestPreFilterStateRemovePod(t *testing.T) {
deletedPod: st.MakePod().Name("p-a0").Node("node-a").Label("bar", "").Obj(), deletedPod: st.MakePod().Name("p-a0").Node("node-a").Label("bar", "").Obj(),
nodeIdx: 0, // node-a nodeIdx: 0, // node-a
want: &preFilterState{ want: &preFilterState{
Constraints: []topologySpreadConstraint{zoneConstraint}, Constraints: []topologySpreadConstraint{zoneConstraint},
TpKeyToDomainsNum: map[string]int{"zone": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone1", 2}, {"zone2", 2}}, "zone": {{"zone1", 2}, {"zone2", 2}},
}, },
@ -2177,7 +2224,8 @@ func TestPreFilterStateRemovePod(t *testing.T) {
deletedPodIdx: 3, // remove pod "p-x1" deletedPodIdx: 3, // remove pod "p-x1"
nodeIdx: 2, // node-x nodeIdx: 2, // node-x
want: &preFilterState{ want: &preFilterState{
Constraints: []topologySpreadConstraint{zoneConstraint, nodeConstraint}, Constraints: []topologySpreadConstraint{zoneConstraint, nodeConstraint},
TpKeyToDomainsNum: map[string]int{"zone": 2, "node": 3},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone2", 1}, {"zone1", 3}}, "zone": {{"zone2", 1}, {"zone1", 3}},
"node": {{"node-b", 1}, {"node-x", 1}}, "node": {{"node-b", 1}, {"node-x", 1}},
@ -2207,7 +2255,8 @@ func TestPreFilterStateRemovePod(t *testing.T) {
st.MakeNode().Name("node-b").Label("zone", "zone2").Label("node", "node-b").Label("foo", "").Obj(), st.MakeNode().Name("node-b").Label("zone", "zone2").Label("node", "node-b").Label("foo", "").Obj(),
}, },
want: &preFilterState{ want: &preFilterState{
Constraints: []topologySpreadConstraint{zoneConstraint}, Constraints: []topologySpreadConstraint{zoneConstraint},
TpKeyToDomainsNum: map[string]int{"zone": 1},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone2", 1}, {MatchNum: math.MaxInt32}}, "zone": {{"zone2", 1}, {MatchNum: math.MaxInt32}},
}, },
@ -2233,7 +2282,8 @@ func TestPreFilterStateRemovePod(t *testing.T) {
st.MakeNode().Name("node-b").Label("zone", "zone2").Label("node", "node-b").Label("foo", "").Obj(), st.MakeNode().Name("node-b").Label("zone", "zone2").Label("node", "node-b").Label("foo", "").Obj(),
}, },
want: &preFilterState{ want: &preFilterState{
Constraints: []topologySpreadConstraint{zoneConstraint}, Constraints: []topologySpreadConstraint{zoneConstraint},
TpKeyToDomainsNum: map[string]int{"zone": 1},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone2", 1}, {MatchNum: math.MaxInt32}}, "zone": {{"zone2", 1}, {MatchNum: math.MaxInt32}},
}, },
@ -2259,7 +2309,8 @@ func TestPreFilterStateRemovePod(t *testing.T) {
st.MakeNode().Name("node-b").Label("zone", "zone2").Label("node", "node-b").Label("foo", "").Obj(), st.MakeNode().Name("node-b").Label("zone", "zone2").Label("node", "node-b").Label("foo", "").Obj(),
}, },
want: &preFilterState{ want: &preFilterState{
Constraints: []topologySpreadConstraint{zoneConstraint}, Constraints: []topologySpreadConstraint{zoneConstraint},
TpKeyToDomainsNum: map[string]int{"zone": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone2", 0}, {"zone1", 1}}, "zone": {{"zone2", 0}, {"zone1", 1}},
}, },
@ -2286,7 +2337,8 @@ func TestPreFilterStateRemovePod(t *testing.T) {
st.MakeNode().Name("node-b").Label("zone", "zone2").Label("node", "node-b").Label("foo", "").Obj(), st.MakeNode().Name("node-b").Label("zone", "zone2").Label("node", "node-b").Label("foo", "").Obj(),
}, },
want: &preFilterState{ want: &preFilterState{
Constraints: []topologySpreadConstraint{zoneConstraint}, Constraints: []topologySpreadConstraint{zoneConstraint},
TpKeyToDomainsNum: map[string]int{"zone": 2},
TpKeyToCriticalPaths: map[string]*criticalPaths{ TpKeyToCriticalPaths: map[string]*criticalPaths{
"zone": {{"zone2", 0}, {"zone1", 1}}, "zone": {{"zone2", 0}, {"zone1", 1}},
}, },
@ -2416,7 +2468,6 @@ func TestSingleConstraint(t *testing.T) {
nodes []*v1.Node nodes []*v1.Node
existingPods []*v1.Pod existingPods []*v1.Pod
wantStatusCode map[string]framework.Code wantStatusCode map[string]framework.Code
enableMinDomains bool
enableNodeInclusionPolicy bool enableNodeInclusionPolicy bool
}{ }{
{ {
@ -2748,7 +2799,6 @@ func TestSingleConstraint(t *testing.T) {
st.MakePod().Name("p-b2").Node("node-b").Label("foo", "").Obj(), st.MakePod().Name("p-b2").Node("node-b").Label("foo", "").Obj(),
st.MakePod().Name("p-c1").Node("node-c").Label("foo", "").Obj(), st.MakePod().Name("p-c1").Node("node-c").Label("foo", "").Obj(),
}, },
enableMinDomains: true,
wantStatusCode: map[string]framework.Code{ wantStatusCode: map[string]framework.Code{
"node-a": framework.Unschedulable, "node-a": framework.Unschedulable,
"node-b": framework.Unschedulable, "node-b": framework.Unschedulable,
@ -2779,7 +2829,6 @@ func TestSingleConstraint(t *testing.T) {
st.MakePod().Name("p-b2").Node("node-b").Label("foo", "").Obj(), st.MakePod().Name("p-b2").Node("node-b").Label("foo", "").Obj(),
st.MakePod().Name("p-c1").Node("node-c").Label("foo", "").Obj(), st.MakePod().Name("p-c1").Node("node-c").Label("foo", "").Obj(),
}, },
enableMinDomains: true,
wantStatusCode: map[string]framework.Code{ wantStatusCode: map[string]framework.Code{
"node-a": framework.Success, "node-a": framework.Success,
"node-b": framework.Success, "node-b": framework.Success,
@ -2809,7 +2858,6 @@ func TestSingleConstraint(t *testing.T) {
st.MakePod().Name("p-b2").Node("node-b").Label("foo", "").Obj(), st.MakePod().Name("p-b2").Node("node-b").Label("foo", "").Obj(),
st.MakePod().Name("p-y1").Node("node-y").Label("foo", "").Obj(), st.MakePod().Name("p-y1").Node("node-y").Label("foo", "").Obj(),
}, },
enableMinDomains: true,
wantStatusCode: map[string]framework.Code{ wantStatusCode: map[string]framework.Code{
"node-a": framework.Unschedulable, "node-a": framework.Unschedulable,
"node-b": framework.Unschedulable, "node-b": framework.Unschedulable,
@ -2840,7 +2888,6 @@ func TestSingleConstraint(t *testing.T) {
st.MakePod().Name("p-b2").Node("node-b").Label("foo", "").Obj(), st.MakePod().Name("p-b2").Node("node-b").Label("foo", "").Obj(),
st.MakePod().Name("p-y1").Node("node-y").Label("foo", "").Obj(), st.MakePod().Name("p-y1").Node("node-y").Label("foo", "").Obj(),
}, },
enableMinDomains: true,
wantStatusCode: map[string]framework.Code{ wantStatusCode: map[string]framework.Code{
"node-a": framework.Success, "node-a": framework.Success,
"node-b": framework.Success, "node-b": framework.Success,
@ -3009,7 +3056,6 @@ func TestSingleConstraint(t *testing.T) {
snapshot := cache.NewSnapshot(tt.existingPods, tt.nodes) snapshot := cache.NewSnapshot(tt.existingPods, tt.nodes)
pl := plugintesting.SetupPlugin(ctx, t, topologySpreadFunc, &config.PodTopologySpreadArgs{DefaultingType: config.ListDefaulting}, snapshot) pl := plugintesting.SetupPlugin(ctx, t, topologySpreadFunc, &config.PodTopologySpreadArgs{DefaultingType: config.ListDefaulting}, snapshot)
p := pl.(*PodTopologySpread) p := pl.(*PodTopologySpread)
p.enableMinDomainsInPodTopologySpread = tt.enableMinDomains
p.enableNodeInclusionPolicyInPodTopologySpread = tt.enableNodeInclusionPolicy p.enableNodeInclusionPolicyInPodTopologySpread = tt.enableNodeInclusionPolicy
state := framework.NewCycleState() state := framework.NewCycleState()
if _, s := p.PreFilter(ctx, state, tt.pod); !s.IsSuccess() { if _, s := p.PreFilter(ctx, state, tt.pod); !s.IsSuccess() {

8
pkg/scheduler/framework/plugins/podtopologyspread/plugin.go
View File

@ -67,7 +67,6 @@ type PodTopologySpread struct {
replicationCtrls corelisters.ReplicationControllerLister replicationCtrls corelisters.ReplicationControllerLister
replicaSets appslisters.ReplicaSetLister replicaSets appslisters.ReplicaSetLister
statefulSets appslisters.StatefulSetLister statefulSets appslisters.StatefulSetLister
enableMinDomainsInPodTopologySpread bool
enableNodeInclusionPolicyInPodTopologySpread bool enableNodeInclusionPolicyInPodTopologySpread bool
enableMatchLabelKeysInPodTopologySpread bool enableMatchLabelKeysInPodTopologySpread bool
} }
@ -99,10 +98,9 @@ func New(_ context.Context, plArgs runtime.Object, h framework.Handle, fts featu
return nil, err return nil, err
} }
pl := &PodTopologySpread{ pl := &PodTopologySpread{
parallelizer: h.Parallelizer(), parallelizer: h.Parallelizer(),
sharedLister: h.SnapshotSharedLister(), sharedLister: h.SnapshotSharedLister(),
defaultConstraints: args.DefaultConstraints, defaultConstraints: args.DefaultConstraints,
enableMinDomainsInPodTopologySpread: fts.EnableMinDomainsInPodTopologySpread,
enableNodeInclusionPolicyInPodTopologySpread: fts.EnableNodeInclusionPolicyInPodTopologySpread, enableNodeInclusionPolicyInPodTopologySpread: fts.EnableNodeInclusionPolicyInPodTopologySpread,
enableMatchLabelKeysInPodTopologySpread: fts.EnableMatchLabelKeysInPodTopologySpread, enableMatchLabelKeysInPodTopologySpread: fts.EnableMatchLabelKeysInPodTopologySpread,
} }

1
pkg/scheduler/framework/plugins/registry.go
View File

@ -48,7 +48,6 @@ func NewInTreeRegistry() runtime.Registry {
fts := plfeature.Features{ fts := plfeature.Features{
EnableDynamicResourceAllocation: feature.DefaultFeatureGate.Enabled(features.DynamicResourceAllocation), EnableDynamicResourceAllocation: feature.DefaultFeatureGate.Enabled(features.DynamicResourceAllocation),
EnableVolumeCapacityPriority: feature.DefaultFeatureGate.Enabled(features.VolumeCapacityPriority), EnableVolumeCapacityPriority: feature.DefaultFeatureGate.Enabled(features.VolumeCapacityPriority),
EnableMinDomainsInPodTopologySpread: feature.DefaultFeatureGate.Enabled(features.MinDomainsInPodTopologySpread),
EnableNodeInclusionPolicyInPodTopologySpread: feature.DefaultFeatureGate.Enabled(features.NodeInclusionPolicyInPodTopologySpread), EnableNodeInclusionPolicyInPodTopologySpread: feature.DefaultFeatureGate.Enabled(features.NodeInclusionPolicyInPodTopologySpread),
EnableMatchLabelKeysInPodTopologySpread: feature.DefaultFeatureGate.Enabled(features.MatchLabelKeysInPodTopologySpread), EnableMatchLabelKeysInPodTopologySpread: feature.DefaultFeatureGate.Enabled(features.MatchLabelKeysInPodTopologySpread),
EnablePodSchedulingReadiness: feature.DefaultFeatureGate.Enabled(features.PodSchedulingReadiness), EnablePodSchedulingReadiness: feature.DefaultFeatureGate.Enabled(features.PodSchedulingReadiness),

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

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