Sok3t/descheduler
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/descheduler.git synced 2026-01-26 13:29:11 +01:00
Code Packages Releases Activity

fix: topologyspreadconstraint plugin to not add PodNodeAffinity unless the inclusion policy is honor

Browse Source
This commit is contained in:
Amir Alavi
2025-07-10 17:27:58 -04:00
parent fbf11df729
commit eadfe4a546
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/framework/plugins/removepodsviolatingtopologyspreadconstraint/topologyspreadconstraint.go
View File

@@ -539,16 +539,16 @@ func newTopologySpreadConstraint(constraint v1.TopologySpreadConstraint, pod *v1
MaxSkew: constraint.MaxSkew,
TopologyKey: constraint.TopologyKey,
Selector: selector,
NodeAffinityPolicy: v1.NodeInclusionPolicyHonor, // If NodeAffinityPolicy is nil, we treat NodeAffinityPolicy as "Honor".
NodeTaintsPolicy: v1.NodeInclusionPolicyIgnore, // If NodeTaintsPolicy is nil, we treat NodeTaintsPolicy as "Ignore".
PodNodeAffinity: nodeaffinity.GetRequiredNodeAffinity(pod),
PodTolerations: pod.Spec.Tolerations,
NodeAffinityPolicy: utilptr.Deref(constraint.NodeAffinityPolicy, v1.NodeInclusionPolicyHonor), // If NodeAffinityPolicy is nil, we treat NodeAffinityPolicy as "Honor".
NodeTaintsPolicy: utilptr.Deref(constraint.NodeTaintsPolicy, v1.NodeInclusionPolicyIgnore), // If NodeTaintsPolicy is nil, we treat NodeTaintsPolicy as "Ignore".
}
if constraint.NodeAffinityPolicy != nil {
tsc.NodeAffinityPolicy = *constraint.NodeAffinityPolicy
if tsc.NodeAffinityPolicy == v1.NodeInclusionPolicyHonor {
tsc.PodNodeAffinity = nodeaffinity.GetRequiredNodeAffinity(pod)
}
if constraint.NodeTaintsPolicy != nil {
tsc.NodeTaintsPolicy = *constraint.NodeTaintsPolicy
if tsc.NodeTaintsPolicy == v1.NodeInclusionPolicyHonor {
tsc.PodTolerations = pod.Spec.Tolerations
}
return tsc, nil