Merge pull request #34543 from ivan4th/dont-require-failure-domains-for-pod-affinity-checker

Automatic merge from submit-queue

Don't require failureDomains in PodAffinityChecker

`failureDomains` are only used for `PreferredDuringScheduling` pod
anti-affinity, which is ignored by `PodAffinityChecker`.
This unnecessary requirement was making it hard to move
`PodAffinityChecker` to `GeneralPredicates` because that would require
passing `--failure-domains` to both `kubelet` and `kube-controller-manager`.
This commit is contained in:
Kubernetes Submit Queue
2017-01-30 08:18:32 -08:00
committed by GitHub
5 changed files with 29 additions and 24 deletions

View File

@@ -140,7 +140,7 @@ func defaultPredicates() sets.String {
factory.RegisterFitPredicateFactory(
"MatchInterPodAffinity",
func(args factory.PluginFactoryArgs) algorithm.FitPredicate {
return predicates.NewPodAffinityPredicate(args.NodeInfo, args.PodLister, args.FailureDomains)
return predicates.NewPodAffinityPredicate(args.NodeInfo, args.PodLister)
},
),