Merge pull request #209 from decayofmind/affinity-empty-struct-fix

Default Pod Selector ignores Pods with affinity set to empty struct
atlassian · Mar 2, 2022 · ac5f8de · ac5f8de
2 parents a0f94e6 + 9585668
commit ac5f8de
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pkg/controller/node_group.go b/pkg/controller/node_group.go
@@ -268,7 +268,9 @@ func NewPodDefaultFilterFunc() k8s.PodFilterFunc {
 		// Only include pods that pass the following:
 		// - Don't have a nodeSelector
 		// - Don't have an affinity
-		return len(pod.Spec.NodeSelector) == 0 && pod.Spec.Affinity == nil
+		return len(pod.Spec.NodeSelector) == 0 && (pod.Spec.Affinity == nil ||
+			(pod.Spec.Affinity.NodeAffinity == nil && pod.Spec.Affinity.PodAffinity == nil &&
+				pod.Spec.Affinity.PodAntiAffinity == nil))
 	}
 }