diff --git a/pkg/scheduler/api/compatibility/compatibility_test.go b/pkg/scheduler/api/compatibility/compatibility_test.go index e126eaa387b..8b2a9c258cb 100644 --- a/pkg/scheduler/api/compatibility/compatibility_test.go +++ b/pkg/scheduler/api/compatibility/compatibility_test.go @@ -251,7 +251,6 @@ func TestCompatibility_v1_Scheduler(t *testing.T) { "MaxEBSVolumeCount", "MaxGCEPDVolumeCount", "MaxAzureDiskVolumeCount", - "MatchInterPodAffinity", "TestServiceAffinity", "TestLabelsPresence", ), @@ -271,6 +270,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) { {Name: "VolumeRestrictions"}, {Name: "TaintToleration"}, {Name: "VolumeZone"}, + {Name: "InterPodAffinity"}, }, "ScorePlugin": { {Name: "ImageLocality", Weight: 2}, @@ -321,7 +321,6 @@ func TestCompatibility_v1_Scheduler(t *testing.T) { "MaxEBSVolumeCount", "MaxGCEPDVolumeCount", "MaxAzureDiskVolumeCount", - "MatchInterPodAffinity", "TestServiceAffinity", "TestLabelsPresence", ), @@ -342,6 +341,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) { {Name: "VolumeRestrictions"}, {Name: "TaintToleration"}, {Name: "VolumeZone"}, + {Name: "InterPodAffinity"}, }, "ScorePlugin": { {Name: "ImageLocality", Weight: 2}, @@ -402,7 +402,6 @@ func TestCompatibility_v1_Scheduler(t *testing.T) { "MaxEBSVolumeCount", "MaxGCEPDVolumeCount", "MaxAzureDiskVolumeCount", - "MatchInterPodAffinity", "TestServiceAffinity", "TestLabelsPresence", ), @@ -423,6 +422,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) { {Name: "VolumeRestrictions"}, {Name: "TaintToleration"}, {Name: "VolumeZone"}, + {Name: "InterPodAffinity"}, }, "ScorePlugin": { {Name: "ImageLocality", Weight: 2}, @@ -496,7 +496,6 @@ func TestCompatibility_v1_Scheduler(t *testing.T) { "MaxEBSVolumeCount", "MaxGCEPDVolumeCount", "MaxAzureDiskVolumeCount", - "MatchInterPodAffinity", "TestServiceAffinity", "TestLabelsPresence", ), @@ -517,6 +516,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) { {Name: "VolumeRestrictions"}, {Name: "TaintToleration"}, {Name: "VolumeZone"}, + {Name: "InterPodAffinity"}, }, "ScorePlugin": { {Name: "ImageLocality", Weight: 2}, @@ -591,7 +591,6 @@ func TestCompatibility_v1_Scheduler(t *testing.T) { "MaxEBSVolumeCount", "MaxGCEPDVolumeCount", "MaxAzureDiskVolumeCount", - "MatchInterPodAffinity", "TestServiceAffinity", "TestLabelsPresence", ), @@ -613,6 +612,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) { {Name: "TaintToleration"}, {Name: "VolumeBinding"}, {Name: "VolumeZone"}, + {Name: "InterPodAffinity"}, }, "ScorePlugin": { {Name: "ImageLocality", Weight: 2}, @@ -692,7 +692,6 @@ func TestCompatibility_v1_Scheduler(t *testing.T) { "MaxEBSVolumeCount", "MaxGCEPDVolumeCount", "MaxAzureDiskVolumeCount", - "MatchInterPodAffinity", "TestServiceAffinity", "TestLabelsPresence", ), @@ -714,6 +713,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) { {Name: "TaintToleration"}, {Name: "VolumeBinding"}, {Name: "VolumeZone"}, + {Name: "InterPodAffinity"}, }, "ScorePlugin": { {Name: "ImageLocality", Weight: 2}, @@ -805,7 +805,6 @@ func TestCompatibility_v1_Scheduler(t *testing.T) { "MaxEBSVolumeCount", "MaxGCEPDVolumeCount", "MaxAzureDiskVolumeCount", - "MatchInterPodAffinity", "TestServiceAffinity", "TestLabelsPresence", ), @@ -828,6 +827,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) { {Name: "TaintToleration"}, {Name: "VolumeBinding"}, {Name: "VolumeZone"}, + {Name: "InterPodAffinity"}, }, "ScorePlugin": { {Name: "ImageLocality", Weight: 2}, @@ -920,7 +920,6 @@ func TestCompatibility_v1_Scheduler(t *testing.T) { "MaxEBSVolumeCount", "MaxGCEPDVolumeCount", "MaxAzureDiskVolumeCount", - "MatchInterPodAffinity", "TestServiceAffinity", "TestLabelsPresence", ), @@ -944,6 +943,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) { {Name: "NodeVolumeLimits"}, {Name: "VolumeBinding"}, {Name: "VolumeZone"}, + {Name: "InterPodAffinity"}, }, "ScorePlugin": { {Name: "ImageLocality", Weight: 2}, @@ -1036,7 +1036,6 @@ func TestCompatibility_v1_Scheduler(t *testing.T) { "MaxGCEPDVolumeCount", "MaxAzureDiskVolumeCount", "MaxCinderVolumeCount", - "MatchInterPodAffinity", "TestServiceAffinity", "TestLabelsPresence", ), @@ -1060,6 +1059,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) { {Name: "NodeVolumeLimits"}, {Name: "VolumeBinding"}, {Name: "VolumeZone"}, + {Name: "InterPodAffinity"}, }, "ScorePlugin": { {Name: "ImageLocality", Weight: 2}, @@ -1156,7 +1156,6 @@ func TestCompatibility_v1_Scheduler(t *testing.T) { "MaxGCEPDVolumeCount", "MaxAzureDiskVolumeCount", "MaxCinderVolumeCount", - "MatchInterPodAffinity", "TestServiceAffinity", "TestLabelsPresence", ), @@ -1180,6 +1179,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) { {Name: "NodeVolumeLimits"}, {Name: "VolumeBinding"}, {Name: "VolumeZone"}, + {Name: "InterPodAffinity"}, }, "ScorePlugin": { {Name: "ImageLocality", Weight: 2}, @@ -1219,6 +1219,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) { "VolumeRestrictions": "NoDiskConflict", "VolumeZone": "NoVolumeZoneConflict", "NodeVolumeLimits": "MaxCSIVolumeCountPred", + "InterPodAffinity": "MatchInterPodAffinity", } scoreToPriorityMap := map[string]string{ "ImageLocality": "ImageLocalityPriority", diff --git a/pkg/scheduler/framework/plugins/BUILD b/pkg/scheduler/framework/plugins/BUILD index 24a48c9a948..36d44d0bca0 100644 --- a/pkg/scheduler/framework/plugins/BUILD +++ b/pkg/scheduler/framework/plugins/BUILD @@ -11,6 +11,7 @@ go_library( "//pkg/scheduler/algorithm/priorities:go_default_library", "//pkg/scheduler/apis/config:go_default_library", "//pkg/scheduler/framework/plugins/imagelocality:go_default_library", + "//pkg/scheduler/framework/plugins/interpodaffinity:go_default_library", "//pkg/scheduler/framework/plugins/nodeaffinity:go_default_library", "//pkg/scheduler/framework/plugins/nodename:go_default_library", "//pkg/scheduler/framework/plugins/nodeports:go_default_library", @@ -43,6 +44,7 @@ filegroup( ":package-srcs", "//pkg/scheduler/framework/plugins/examples:all-srcs", "//pkg/scheduler/framework/plugins/imagelocality:all-srcs", + "//pkg/scheduler/framework/plugins/interpodaffinity:all-srcs", "//pkg/scheduler/framework/plugins/migration:all-srcs", "//pkg/scheduler/framework/plugins/nodeaffinity:all-srcs", "//pkg/scheduler/framework/plugins/nodename:all-srcs", diff --git a/pkg/scheduler/framework/plugins/default_registry.go b/pkg/scheduler/framework/plugins/default_registry.go index 6a97c463799..329d8358376 100644 --- a/pkg/scheduler/framework/plugins/default_registry.go +++ b/pkg/scheduler/framework/plugins/default_registry.go @@ -27,6 +27,7 @@ import ( "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities" "k8s.io/kubernetes/pkg/scheduler/apis/config" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/imagelocality" + "k8s.io/kubernetes/pkg/scheduler/framework/plugins/interpodaffinity" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodeaffinity" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodename" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodeports" @@ -82,6 +83,9 @@ func NewDefaultRegistry(args *RegistryArgs) framework.Registry { nodevolumelimits.Name: func(_ *runtime.Unknown, _ framework.FrameworkHandle) (framework.Plugin, error) { return nodevolumelimits.New(args.SchedulerCache, pvInfo, pvcInfo, classInfo), nil }, + interpodaffinity.Name: func(_ *runtime.Unknown, _ framework.FrameworkHandle) (framework.Plugin, error) { + return interpodaffinity.New(args.SchedulerCache, args.SchedulerCache), nil + }, } } @@ -163,6 +167,11 @@ func NewDefaultConfigProducerRegistry() *ConfigProducerRegistry { plugins.Filter = appendToPluginSet(plugins.Filter, nodevolumelimits.Name, nil) return }) + registry.RegisterPredicate(predicates.MatchInterPodAffinityPred, + func(_ ConfigProducerArgs) (plugins config.Plugins, pluginConfig []config.PluginConfig) { + plugins.Filter = appendToPluginSet(plugins.Filter, interpodaffinity.Name, nil) + return + }) registry.RegisterPriority(priorities.TaintTolerationPriority, func(args ConfigProducerArgs) (plugins config.Plugins, pluginConfig []config.PluginConfig) { diff --git a/pkg/scheduler/framework/plugins/interpodaffinity/BUILD b/pkg/scheduler/framework/plugins/interpodaffinity/BUILD new file mode 100644 index 00000000000..7ade82d84b4 --- /dev/null +++ b/pkg/scheduler/framework/plugins/interpodaffinity/BUILD @@ -0,0 +1,45 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") + +go_library( + name = "go_default_library", + srcs = ["interpod_affinity.go"], + importpath = "k8s.io/kubernetes/pkg/scheduler/framework/plugins/interpodaffinity", + visibility = ["//visibility:public"], + deps = [ + "//pkg/scheduler/algorithm:go_default_library", + "//pkg/scheduler/algorithm/predicates:go_default_library", + "//pkg/scheduler/framework/plugins/migration:go_default_library", + "//pkg/scheduler/framework/v1alpha1:go_default_library", + "//pkg/scheduler/nodeinfo:go_default_library", + "//staging/src/k8s.io/api/core/v1:go_default_library", + ], +) + +go_test( + name = "go_default_test", + srcs = ["interpod_affinity_test.go"], + embed = [":go_default_library"], + deps = [ + "//pkg/scheduler/algorithm/predicates:go_default_library", + "//pkg/scheduler/framework/plugins/migration:go_default_library", + "//pkg/scheduler/framework/v1alpha1:go_default_library", + "//pkg/scheduler/nodeinfo:go_default_library", + "//pkg/scheduler/testing:go_default_library", + "//staging/src/k8s.io/api/core/v1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/pkg/scheduler/framework/plugins/interpodaffinity/interpod_affinity.go b/pkg/scheduler/framework/plugins/interpodaffinity/interpod_affinity.go new file mode 100644 index 00000000000..d01f2f1b6f7 --- /dev/null +++ b/pkg/scheduler/framework/plugins/interpodaffinity/interpod_affinity.go @@ -0,0 +1,61 @@ +/* +Copyright 2019 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package interpodaffinity + +import ( + "context" + "fmt" + + "k8s.io/api/core/v1" + "k8s.io/kubernetes/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" + "k8s.io/kubernetes/pkg/scheduler/framework/plugins/migration" + framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" + "k8s.io/kubernetes/pkg/scheduler/nodeinfo" +) + +// InterPodAffinity is a plugin that checks inter pod affinity +type InterPodAffinity struct { + predicate predicates.FitPredicate +} + +var _ framework.FilterPlugin = &InterPodAffinity{} + +// Name is the name of the plugin used in the plugin registry and configurations. +const Name = "InterPodAffinity" + +// Name returns name of the plugin. It is used in logs, etc. +func (pl *InterPodAffinity) Name() string { + return Name +} + +// Filter invoked at the filter extension point. +func (pl *InterPodAffinity) Filter(ctx context.Context, cycleState *framework.CycleState, pod *v1.Pod, nodeInfo *nodeinfo.NodeInfo) *framework.Status { + meta, ok := migration.PredicateMetadata(cycleState).(predicates.PredicateMetadata) + if !ok { + return migration.ErrorToFrameworkStatus(fmt.Errorf("%+v convert to predicates.PredicateMetadata error", cycleState)) + } + _, reasons, err := pl.predicate(pod, meta, nodeInfo) + return migration.PredicateResultToFrameworkStatus(reasons, err) +} + +// New initializes a new plugin and returns it. +func New(nodeInfo predicates.NodeInfo, podLister algorithm.PodLister) framework.Plugin { + return &InterPodAffinity{ + predicate: predicates.NewPodAffinityPredicate(nodeInfo, podLister), + } +} diff --git a/pkg/scheduler/framework/plugins/interpodaffinity/interpod_affinity_test.go b/pkg/scheduler/framework/plugins/interpodaffinity/interpod_affinity_test.go new file mode 100644 index 00000000000..f679ae30611 --- /dev/null +++ b/pkg/scheduler/framework/plugins/interpodaffinity/interpod_affinity_test.go @@ -0,0 +1,1454 @@ +/* +Copyright 2019 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package interpodaffinity + +import ( + "context" + "reflect" + "testing" + + "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" + "k8s.io/kubernetes/pkg/scheduler/framework/plugins/migration" + framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1" + schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo" + st "k8s.io/kubernetes/pkg/scheduler/testing" +) + +var ( + defaultNamespace = "" + unschedulable = framework.NewStatus(framework.Unschedulable, predicates.ErrPodAffinityNotMatch.GetReason()) + unschedulableAndUnresolvable = framework.NewStatus(framework.UnschedulableAndUnresolvable, predicates.ErrPodAffinityRulesNotMatch.GetReason()) +) + +func createPodWithAffinityTerms(namespace, nodeName string, labels map[string]string, affinity, antiAffinity []v1.PodAffinityTerm) *v1.Pod { + return &v1.Pod{ + ObjectMeta: metav1.ObjectMeta{ + Labels: labels, + Namespace: namespace, + }, + Spec: v1.PodSpec{ + NodeName: nodeName, + Affinity: &v1.Affinity{ + PodAffinity: &v1.PodAffinity{ + RequiredDuringSchedulingIgnoredDuringExecution: affinity, + }, + PodAntiAffinity: &v1.PodAntiAffinity{ + RequiredDuringSchedulingIgnoredDuringExecution: antiAffinity, + }, + }, + }, + } + +} + +func TestSingleNode(t *testing.T) { + podLabel := map[string]string{"service": "securityscan"} + labels1 := map[string]string{ + "region": "r1", + "zone": "z11", + } + podLabel2 := map[string]string{"security": "S1"} + node1 := v1.Node{ObjectMeta: metav1.ObjectMeta{Name: "machine1", Labels: labels1}} + tests := []struct { + pod *v1.Pod + pods []*v1.Pod + node *v1.Node + name string + wantStatus *framework.Status + }{ + { + pod: new(v1.Pod), + node: &node1, + name: "A pod that has no required pod affinity scheduling rules can schedule onto a node with no existing pods", + }, + { + pod: createPodWithAffinityTerms(defaultNamespace, "", podLabel2, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "service", + Operator: metav1.LabelSelectorOpIn, + Values: []string{"securityscan", "value2"}, + }, + }, + }, + TopologyKey: "region", + }, + }, nil), + pods: []*v1.Pod{{Spec: v1.PodSpec{NodeName: "machine1"}, ObjectMeta: metav1.ObjectMeta{Labels: podLabel}}}, + node: &node1, + name: "satisfies with requiredDuringSchedulingIgnoredDuringExecution in PodAffinity using In operator that matches the existing pod", + }, + { + pod: createPodWithAffinityTerms(defaultNamespace, "", podLabel2, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "service", + Operator: metav1.LabelSelectorOpNotIn, + Values: []string{"securityscan3", "value3"}, + }, + }, + }, + TopologyKey: "region", + }, + }, nil), + pods: []*v1.Pod{{Spec: v1.PodSpec{NodeName: "machine1"}, ObjectMeta: metav1.ObjectMeta{Labels: podLabel}}}, + node: &node1, + name: "satisfies the pod with requiredDuringSchedulingIgnoredDuringExecution in PodAffinity using not in operator in labelSelector that matches the existing pod", + }, + { + pod: createPodWithAffinityTerms(defaultNamespace, "", podLabel2, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "service", + Operator: metav1.LabelSelectorOpIn, + Values: []string{"securityscan", "value2"}, + }, + }, + }, + Namespaces: []string{"DiffNameSpace"}, + }, + }, nil), + pods: []*v1.Pod{{Spec: v1.PodSpec{NodeName: "machine1"}, ObjectMeta: metav1.ObjectMeta{Labels: podLabel, Namespace: "ns"}}}, + node: &node1, + name: "Does not satisfy the PodAffinity with labelSelector because of diff Namespace", + wantStatus: unschedulableAndUnresolvable, + }, + { + pod: createPodWithAffinityTerms(defaultNamespace, "", podLabel, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "service", + Operator: metav1.LabelSelectorOpIn, + Values: []string{"antivirusscan", "value2"}, + }, + }, + }, + }, + }, nil), + pods: []*v1.Pod{{Spec: v1.PodSpec{NodeName: "machine1"}, ObjectMeta: metav1.ObjectMeta{Labels: podLabel}}}, + node: &node1, + name: "Doesn't satisfy the PodAffinity because of unmatching labelSelector with the existing pod", + wantStatus: unschedulableAndUnresolvable, + }, + { + pod: createPodWithAffinityTerms(defaultNamespace, "", podLabel2, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "service", + Operator: metav1.LabelSelectorOpExists, + }, { + Key: "wrongkey", + Operator: metav1.LabelSelectorOpDoesNotExist, + }, + }, + }, + TopologyKey: "region", + }, { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "service", + Operator: metav1.LabelSelectorOpIn, + Values: []string{"securityscan"}, + }, { + Key: "service", + Operator: metav1.LabelSelectorOpNotIn, + Values: []string{"WrongValue"}, + }, + }, + }, + TopologyKey: "region", + }, + }, nil), + pods: []*v1.Pod{{Spec: v1.PodSpec{NodeName: "machine1"}, ObjectMeta: metav1.ObjectMeta{Labels: podLabel}}}, + node: &node1, + name: "satisfies the PodAffinity with different label Operators in multiple RequiredDuringSchedulingIgnoredDuringExecution ", + }, + { + pod: createPodWithAffinityTerms(defaultNamespace, "", podLabel2, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "service", + Operator: metav1.LabelSelectorOpExists, + }, { + Key: "wrongkey", + Operator: metav1.LabelSelectorOpDoesNotExist, + }, + }, + }, + TopologyKey: "region", + }, { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "service", + Operator: metav1.LabelSelectorOpIn, + Values: []string{"securityscan2"}, + }, { + Key: "service", + Operator: metav1.LabelSelectorOpNotIn, + Values: []string{"WrongValue"}, + }, + }, + }, + TopologyKey: "region", + }, + }, nil), + pods: []*v1.Pod{{Spec: v1.PodSpec{NodeName: "machine1"}, ObjectMeta: metav1.ObjectMeta{Labels: podLabel}}}, + node: &node1, + name: "The labelSelector requirements(items of matchExpressions) are ANDed, the pod cannot schedule onto the node because one of the matchExpression item don't match.", + wantStatus: unschedulableAndUnresolvable, + }, + { + pod: createPodWithAffinityTerms(defaultNamespace, "", podLabel2, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "service", + Operator: metav1.LabelSelectorOpIn, + Values: []string{"securityscan", "value2"}, + }, + }, + }, + TopologyKey: "region", + }, + }, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "service", + Operator: metav1.LabelSelectorOpIn, + Values: []string{"antivirusscan", "value2"}, + }, + }, + }, + TopologyKey: "node", + }, + }), + pods: []*v1.Pod{{Spec: v1.PodSpec{NodeName: "machine1"}, ObjectMeta: metav1.ObjectMeta{Labels: podLabel}}}, + node: &node1, + name: "satisfies the PodAffinity and PodAntiAffinity with the existing pod", + }, + { + pod: createPodWithAffinityTerms(defaultNamespace, "", podLabel2, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "service", + Operator: metav1.LabelSelectorOpIn, + Values: []string{"securityscan", "value2"}, + }, + }, + }, + TopologyKey: "region", + }, + }, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "service", + Operator: metav1.LabelSelectorOpIn, + Values: []string{"antivirusscan", "value2"}, + }, + }, + }, + TopologyKey: "node", + }, + }), + pods: []*v1.Pod{ + createPodWithAffinityTerms(defaultNamespace, "machine1", podLabel, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "service", + Operator: metav1.LabelSelectorOpIn, + Values: []string{"antivirusscan", "value2"}, + }, + }, + }, + TopologyKey: "node", + }, + }), + }, + node: &node1, + name: "satisfies the PodAffinity and PodAntiAffinity and PodAntiAffinity symmetry with the existing pod", + }, + { + pod: createPodWithAffinityTerms(defaultNamespace, "", podLabel2, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "service", + Operator: metav1.LabelSelectorOpIn, + Values: []string{"securityscan", "value2"}, + }, + }, + }, + TopologyKey: "region", + }, + }, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "service", + Operator: metav1.LabelSelectorOpIn, + Values: []string{"securityscan", "value2"}, + }, + }, + }, + TopologyKey: "zone", + }, + }), + pods: []*v1.Pod{{Spec: v1.PodSpec{NodeName: "machine1"}, ObjectMeta: metav1.ObjectMeta{Labels: podLabel}}}, + node: &node1, + name: "satisfies the PodAffinity but doesn't satisfy the PodAntiAffinity with the existing pod", + wantStatus: unschedulable, + }, + { + pod: createPodWithAffinityTerms(defaultNamespace, "", podLabel, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "service", + Operator: metav1.LabelSelectorOpIn, + Values: []string{"securityscan", "value2"}, + }, + }, + }, + TopologyKey: "region", + }, + }, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "service", + Operator: metav1.LabelSelectorOpIn, + Values: []string{"antivirusscan", "value2"}, + }, + }, + }, + TopologyKey: "node", + }, + }), + pods: []*v1.Pod{ + createPodWithAffinityTerms(defaultNamespace, "machine1", podLabel, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "service", + Operator: metav1.LabelSelectorOpIn, + Values: []string{"securityscan", "value2"}, + }, + }, + }, + TopologyKey: "zone", + }, + }), + }, + node: &node1, + name: "satisfies the PodAffinity and PodAntiAffinity but doesn't satisfy PodAntiAffinity symmetry with the existing pod", + wantStatus: unschedulable, + }, + { + pod: createPodWithAffinityTerms(defaultNamespace, "", podLabel, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "service", + Operator: metav1.LabelSelectorOpNotIn, + Values: []string{"securityscan", "value2"}, + }, + }, + }, + TopologyKey: "region", + }, + }, nil), + pods: []*v1.Pod{{Spec: v1.PodSpec{NodeName: "machine2"}, ObjectMeta: metav1.ObjectMeta{Labels: podLabel}}}, + node: &node1, + name: "pod matches its own Label in PodAffinity and that matches the existing pod Labels", + wantStatus: unschedulableAndUnresolvable, + }, + { + pod: &v1.Pod{ + ObjectMeta: metav1.ObjectMeta{ + Labels: podLabel, + }, + }, + pods: []*v1.Pod{ + createPodWithAffinityTerms(defaultNamespace, "machine1", podLabel, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "service", + Operator: metav1.LabelSelectorOpIn, + Values: []string{"securityscan", "value2"}, + }, + }, + }, + TopologyKey: "zone", + }, + }), + }, + node: &node1, + name: "verify that PodAntiAffinity from existing pod is respected when pod has no AntiAffinity constraints. doesn't satisfy PodAntiAffinity symmetry with the existing pod", + wantStatus: unschedulable, + }, + { + pod: &v1.Pod{ + ObjectMeta: metav1.ObjectMeta{ + Labels: podLabel, + }, + }, + pods: []*v1.Pod{ + createPodWithAffinityTerms(defaultNamespace, "machine1", podLabel, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "service", + Operator: metav1.LabelSelectorOpNotIn, + Values: []string{"securityscan", "value2"}, + }, + }, + }, + TopologyKey: "zone", + }, + }), + }, + node: &node1, + name: "verify that PodAntiAffinity from existing pod is respected when pod has no AntiAffinity constraints. satisfy PodAntiAffinity symmetry with the existing pod", + }, + { + pod: createPodWithAffinityTerms(defaultNamespace, "", podLabel, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "service", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "region", + }, + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "security", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "region", + }, + }), + pods: []*v1.Pod{ + createPodWithAffinityTerms(defaultNamespace, "machine1", podLabel2, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "security", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + }), + }, + node: &node1, + name: "satisfies the PodAntiAffinity with existing pod but doesn't satisfy PodAntiAffinity symmetry with incoming pod", + wantStatus: unschedulable, + }, + { + pod: createPodWithAffinityTerms(defaultNamespace, "", podLabel, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "service", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "security", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + }), + pods: []*v1.Pod{ + createPodWithAffinityTerms(defaultNamespace, "machine1", podLabel2, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "security", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + }), + }, + node: &node1, + wantStatus: unschedulable, + name: "PodAntiAffinity symmetry check a1: incoming pod and existing pod partially match each other on AffinityTerms", + }, + { + pod: createPodWithAffinityTerms(defaultNamespace, "", podLabel2, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "security", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + }), + pods: []*v1.Pod{ + createPodWithAffinityTerms(defaultNamespace, "machine1", podLabel, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "service", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "security", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + }), + }, + node: &node1, + wantStatus: unschedulable, + name: "PodAntiAffinity symmetry check a2: incoming pod and existing pod partially match each other on AffinityTerms", + }, + { + pod: createPodWithAffinityTerms(defaultNamespace, "", map[string]string{"abc": "", "xyz": ""}, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "abc", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "def", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + }), + pods: []*v1.Pod{ + createPodWithAffinityTerms(defaultNamespace, "machine1", map[string]string{"def": "", "xyz": ""}, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "abc", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "def", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + }), + }, + node: &node1, + wantStatus: unschedulable, + name: "PodAntiAffinity symmetry check b1: incoming pod and existing pod partially match each other on AffinityTerms", + }, + { + pod: createPodWithAffinityTerms(defaultNamespace, "", map[string]string{"def": "", "xyz": ""}, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "abc", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "def", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + }), + pods: []*v1.Pod{ + createPodWithAffinityTerms(defaultNamespace, "machine1", map[string]string{"abc": "", "xyz": ""}, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "abc", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "def", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + }), + }, + node: &node1, + wantStatus: unschedulable, + name: "PodAntiAffinity symmetry check b2: incoming pod and existing pod partially match each other on AffinityTerms", + }, + } + + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + node := test.node + nodeInfoMap := schedulernodeinfo.CreateNodeNameToInfoMap(test.pods, []*v1.Node{node}) + meta := predicates.GetPredicateMetadata(test.pod, nodeInfoMap) + state := framework.NewCycleState() + state.Write(migration.PredicatesStateKey, &migration.PredicatesStateData{Reference: meta}) + + p := New(predicates.FakeNodeInfo(*node), st.FakePodLister(test.pods)) + gotStatus := p.(framework.FilterPlugin).Filter(context.Background(), state, test.pod, nodeInfoMap[node.Name]) + if !reflect.DeepEqual(gotStatus, test.wantStatus) { + t.Errorf("status does not match: %v, want: %v", gotStatus, test.wantStatus) + } + }) + } +} + +func TestMultipleNodes(t *testing.T) { + podLabelA := map[string]string{ + "foo": "bar", + } + labelRgChina := map[string]string{ + "region": "China", + } + labelRgChinaAzAz1 := map[string]string{ + "region": "China", + "az": "az1", + } + labelRgIndia := map[string]string{ + "region": "India", + } + + tests := []struct { + pod *v1.Pod + pods []*v1.Pod + nodes []*v1.Node + wantStatuses []*framework.Status + name string + }{ + { + pod: createPodWithAffinityTerms(defaultNamespace, "", nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "foo", + Operator: metav1.LabelSelectorOpIn, + Values: []string{"bar"}, + }, + }, + }, + TopologyKey: "region", + }, + }, nil), + pods: []*v1.Pod{ + {Spec: v1.PodSpec{NodeName: "machine1"}, ObjectMeta: metav1.ObjectMeta{Name: "p1", Labels: podLabelA}}, + }, + nodes: []*v1.Node{ + {ObjectMeta: metav1.ObjectMeta{Name: "machine1", Labels: labelRgChina}}, + {ObjectMeta: metav1.ObjectMeta{Name: "machine2", Labels: labelRgChinaAzAz1}}, + {ObjectMeta: metav1.ObjectMeta{Name: "machine3", Labels: labelRgIndia}}, + }, + wantStatuses: []*framework.Status{nil, nil, unschedulableAndUnresolvable}, + name: "A pod can be scheduled onto all the nodes that have the same topology key & label value with one of them has an existing pod that matches the affinity rules", + }, + { + pod: createPodWithAffinityTerms(defaultNamespace, "", map[string]string{"foo": "bar", "service": "securityscan"}, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "foo", + Operator: metav1.LabelSelectorOpIn, + Values: []string{"bar"}, + }, + }, + }, + TopologyKey: "zone", + }, + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "service", + Operator: metav1.LabelSelectorOpIn, + Values: []string{"securityscan"}, + }, + }, + }, + TopologyKey: "zone", + }, + }, nil), + pods: []*v1.Pod{{Spec: v1.PodSpec{NodeName: "nodeA"}, ObjectMeta: metav1.ObjectMeta{Name: "p1", Labels: map[string]string{"foo": "bar"}}}}, + nodes: []*v1.Node{ + {ObjectMeta: metav1.ObjectMeta{Name: "nodeA", Labels: map[string]string{"zone": "az1", "hostname": "h1"}}}, + {ObjectMeta: metav1.ObjectMeta{Name: "nodeB", Labels: map[string]string{"zone": "az2", "hostname": "h2"}}}, + }, + wantStatuses: []*framework.Status{nil, nil}, + name: "The affinity rule is to schedule all of the pods of this collection to the same zone. The first pod of the collection " + + "should not be blocked from being scheduled onto any node, even there's no existing pod that matches the rule anywhere.", + }, + { + pod: createPodWithAffinityTerms(defaultNamespace, "", nil, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "foo", + Operator: metav1.LabelSelectorOpIn, + Values: []string{"abc"}, + }, + }, + }, + TopologyKey: "region", + }, + }), + pods: []*v1.Pod{ + {Spec: v1.PodSpec{NodeName: "nodeA"}, ObjectMeta: metav1.ObjectMeta{Labels: map[string]string{"foo": "abc"}}}, + }, + nodes: []*v1.Node{ + {ObjectMeta: metav1.ObjectMeta{Name: "nodeA", Labels: map[string]string{"region": "r1", "hostname": "nodeA"}}}, + {ObjectMeta: metav1.ObjectMeta{Name: "nodeB", Labels: map[string]string{"region": "r1", "hostname": "nodeB"}}}, + }, + wantStatuses: []*framework.Status{unschedulable, unschedulable}, + name: "NodeA and nodeB have same topologyKey and label value. NodeA has an existing pod that matches the inter pod affinity rule. The pod can not be scheduled onto nodeA and nodeB.", + }, + { + pod: createPodWithAffinityTerms(defaultNamespace, "", nil, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "foo", + Operator: metav1.LabelSelectorOpIn, + Values: []string{"abc"}, + }, + }, + }, + TopologyKey: "region", + }, + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "service", + Operator: metav1.LabelSelectorOpIn, + Values: []string{"securityscan"}, + }, + }, + }, + TopologyKey: "zone", + }, + }), + pods: []*v1.Pod{ + {Spec: v1.PodSpec{NodeName: "nodeA"}, ObjectMeta: metav1.ObjectMeta{Labels: map[string]string{"foo": "abc", "service": "securityscan"}}}, + }, + nodes: []*v1.Node{ + {ObjectMeta: metav1.ObjectMeta{Name: "nodeA", Labels: map[string]string{"region": "r1", "zone": "z1", "hostname": "nodeA"}}}, + {ObjectMeta: metav1.ObjectMeta{Name: "nodeB", Labels: map[string]string{"region": "r1", "zone": "z2", "hostname": "nodeB"}}}, + }, + wantStatuses: []*framework.Status{unschedulable, unschedulable}, + name: "This test ensures that anti-affinity matches a pod when any term of the anti-affinity rule matches a pod.", + }, + { + pod: createPodWithAffinityTerms(defaultNamespace, "", nil, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "foo", + Operator: metav1.LabelSelectorOpIn, + Values: []string{"abc"}, + }, + }, + }, + TopologyKey: "region", + }, + }), + pods: []*v1.Pod{ + {Spec: v1.PodSpec{NodeName: "nodeA"}, ObjectMeta: metav1.ObjectMeta{Labels: map[string]string{"foo": "abc"}}}, + }, + nodes: []*v1.Node{ + {ObjectMeta: metav1.ObjectMeta{Name: "nodeA", Labels: labelRgChina}}, + {ObjectMeta: metav1.ObjectMeta{Name: "nodeB", Labels: labelRgChinaAzAz1}}, + {ObjectMeta: metav1.ObjectMeta{Name: "nodeC", Labels: labelRgIndia}}, + }, + wantStatuses: []*framework.Status{unschedulable, unschedulable, nil}, + name: "NodeA and nodeB have same topologyKey and label value. NodeA has an existing pod that matches the inter pod affinity rule. The pod can not be scheduled onto nodeA and nodeB but can be scheduled onto nodeC", + }, + { + pod: createPodWithAffinityTerms("NS1", "", map[string]string{"foo": "123"}, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "foo", + Operator: metav1.LabelSelectorOpIn, + Values: []string{"bar"}, + }, + }, + }, + TopologyKey: "region", + }, + }), + pods: []*v1.Pod{ + { + ObjectMeta: metav1.ObjectMeta{ + Labels: map[string]string{"foo": "bar"}, + Namespace: "NS1", + }, + Spec: v1.PodSpec{NodeName: "nodeA"}, + }, + createPodWithAffinityTerms("NS2", "nodeC", nil, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "foo", + Operator: metav1.LabelSelectorOpIn, + Values: []string{"123"}, + }, + }, + }, + TopologyKey: "region", + }, + }), + }, + nodes: []*v1.Node{ + {ObjectMeta: metav1.ObjectMeta{Name: "nodeA", Labels: labelRgChina}}, + {ObjectMeta: metav1.ObjectMeta{Name: "nodeB", Labels: labelRgChinaAzAz1}}, + {ObjectMeta: metav1.ObjectMeta{Name: "nodeC", Labels: labelRgIndia}}, + }, + wantStatuses: []*framework.Status{unschedulable, unschedulable, nil}, + name: "NodeA and nodeB have same topologyKey and label value. NodeA has an existing pod that matches the inter pod affinity rule. The pod can not be scheduled onto nodeA, nodeB, but can be scheduled onto nodeC (NodeC has an existing pod that match the inter pod affinity rule but in different namespace)", + }, + { + pod: &v1.Pod{ + ObjectMeta: metav1.ObjectMeta{Labels: map[string]string{"foo": ""}}, + }, + pods: []*v1.Pod{ + createPodWithAffinityTerms(defaultNamespace, "nodeA", nil, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "foo", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "invalid-node-label", + }, + }), + }, + nodes: []*v1.Node{ + {ObjectMeta: metav1.ObjectMeta{Name: "nodeA", Labels: map[string]string{"region": "r1", "zone": "z1", "hostname": "nodeA"}}}, + {ObjectMeta: metav1.ObjectMeta{Name: "nodeB", Labels: map[string]string{"region": "r1", "zone": "z1", "hostname": "nodeB"}}}, + }, + wantStatuses: []*framework.Status{nil, nil}, + name: "Test existing pod's anti-affinity: if an existing pod has a term with invalid topologyKey, labelSelector of the term is firstly checked, and then topologyKey of the term is also checked", + }, + { + pod: createPodWithAffinityTerms(defaultNamespace, "", nil, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "foo", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "invalid-node-label", + }, + }), + pods: []*v1.Pod{ + { + ObjectMeta: metav1.ObjectMeta{Labels: map[string]string{"foo": ""}}, + Spec: v1.PodSpec{ + NodeName: "nodeA", + }, + }, + }, + nodes: []*v1.Node{ + {ObjectMeta: metav1.ObjectMeta{Name: "nodeA", Labels: map[string]string{"region": "r1", "zone": "z1", "hostname": "nodeA"}}}, + {ObjectMeta: metav1.ObjectMeta{Name: "nodeB", Labels: map[string]string{"region": "r1", "zone": "z1", "hostname": "nodeB"}}}, + }, + wantStatuses: []*framework.Status{nil, nil}, + name: "Test incoming pod's anti-affinity: even if labelSelector matches, we still check if topologyKey matches", + }, + { + pod: &v1.Pod{ + ObjectMeta: metav1.ObjectMeta{Labels: map[string]string{"foo": "", "bar": ""}}, + }, + pods: []*v1.Pod{ + createPodWithAffinityTerms(defaultNamespace, "nodeA", nil, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "foo", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + }), + createPodWithAffinityTerms(defaultNamespace, "nodeA", nil, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "bar", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "region", + }, + }), + }, + nodes: []*v1.Node{ + {ObjectMeta: metav1.ObjectMeta{Name: "nodeA", Labels: map[string]string{"region": "r1", "zone": "z1", "hostname": "nodeA"}}}, + {ObjectMeta: metav1.ObjectMeta{Name: "nodeB", Labels: map[string]string{"region": "r1", "zone": "z2", "hostname": "nodeB"}}}, + }, + wantStatuses: []*framework.Status{unschedulable, unschedulable}, + name: "Test existing pod's anti-affinity: incoming pod wouldn't considered as a fit as it violates each existingPod's terms on all nodes", + }, + { + pod: createPodWithAffinityTerms(defaultNamespace, "", nil, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "foo", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "bar", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "region", + }, + }), + pods: []*v1.Pod{ + { + ObjectMeta: metav1.ObjectMeta{Labels: map[string]string{"foo": ""}}, + Spec: v1.PodSpec{ + NodeName: "nodeA", + }, + }, + { + ObjectMeta: metav1.ObjectMeta{Labels: map[string]string{"bar": ""}}, + Spec: v1.PodSpec{ + NodeName: "nodeB", + }, + }, + }, + nodes: []*v1.Node{ + {ObjectMeta: metav1.ObjectMeta{Name: "nodeA", Labels: map[string]string{"region": "r1", "zone": "z1", "hostname": "nodeA"}}}, + {ObjectMeta: metav1.ObjectMeta{Name: "nodeB", Labels: map[string]string{"region": "r1", "zone": "z2", "hostname": "nodeB"}}}, + }, + wantStatuses: []*framework.Status{unschedulable, unschedulable}, + name: "Test incoming pod's anti-affinity: incoming pod wouldn't considered as a fit as it at least violates one anti-affinity rule of existingPod", + }, + { + pod: &v1.Pod{ + ObjectMeta: metav1.ObjectMeta{Labels: map[string]string{"foo": "", "bar": ""}}, + }, + pods: []*v1.Pod{ + createPodWithAffinityTerms(defaultNamespace, "nodeA", nil, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "foo", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "invalid-node-label", + }, + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "bar", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + }), + }, + nodes: []*v1.Node{ + {ObjectMeta: metav1.ObjectMeta{Name: "nodeA", Labels: map[string]string{"region": "r1", "zone": "z1", "hostname": "nodeA"}}}, + {ObjectMeta: metav1.ObjectMeta{Name: "nodeB", Labels: map[string]string{"region": "r1", "zone": "z2", "hostname": "nodeB"}}}, + }, + wantStatuses: []*framework.Status{unschedulable, nil}, + name: "Test existing pod's anti-affinity: only when labelSelector and topologyKey both match, it's counted as a single term match - case when one term has invalid topologyKey", + }, + { + pod: createPodWithAffinityTerms(defaultNamespace, "", nil, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "foo", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "invalid-node-label", + }, + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "bar", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + }), + pods: []*v1.Pod{ + { + ObjectMeta: metav1.ObjectMeta{Name: "podA", Labels: map[string]string{"foo": "", "bar": ""}}, + Spec: v1.PodSpec{ + NodeName: "nodeA", + }, + }, + }, + nodes: []*v1.Node{ + {ObjectMeta: metav1.ObjectMeta{Name: "nodeA", Labels: map[string]string{"region": "r1", "zone": "z1", "hostname": "nodeA"}}}, + {ObjectMeta: metav1.ObjectMeta{Name: "nodeB", Labels: map[string]string{"region": "r1", "zone": "z2", "hostname": "nodeB"}}}, + }, + wantStatuses: []*framework.Status{unschedulable, nil}, + name: "Test incoming pod's anti-affinity: only when labelSelector and topologyKey both match, it's counted as a single term match - case when one term has invalid topologyKey", + }, + { + pod: &v1.Pod{ + ObjectMeta: metav1.ObjectMeta{Labels: map[string]string{"foo": "", "bar": ""}}, + }, + pods: []*v1.Pod{ + createPodWithAffinityTerms(defaultNamespace, "nodeA", nil, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "foo", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "region", + }, + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "bar", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + }), + }, + nodes: []*v1.Node{ + {ObjectMeta: metav1.ObjectMeta{Name: "nodeA", Labels: map[string]string{"region": "r1", "zone": "z1", "hostname": "nodeA"}}}, + {ObjectMeta: metav1.ObjectMeta{Name: "nodeB", Labels: map[string]string{"region": "r1", "zone": "z2", "hostname": "nodeB"}}}, + }, + wantStatuses: []*framework.Status{unschedulable, unschedulable}, + name: "Test existing pod's anti-affinity: only when labelSelector and topologyKey both match, it's counted as a single term match - case when all terms have valid topologyKey", + }, + { + pod: createPodWithAffinityTerms(defaultNamespace, "", nil, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "foo", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "region", + }, + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "bar", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + }), + pods: []*v1.Pod{ + { + ObjectMeta: metav1.ObjectMeta{Labels: map[string]string{"foo": "", "bar": ""}}, + Spec: v1.PodSpec{ + NodeName: "nodeA", + }, + }, + }, + nodes: []*v1.Node{ + {ObjectMeta: metav1.ObjectMeta{Name: "nodeA", Labels: map[string]string{"region": "r1", "zone": "z1", "hostname": "nodeA"}}}, + {ObjectMeta: metav1.ObjectMeta{Name: "nodeB", Labels: map[string]string{"region": "r1", "zone": "z2", "hostname": "nodeB"}}}, + }, + wantStatuses: []*framework.Status{unschedulable, unschedulable}, + name: "Test incoming pod's anti-affinity: only when labelSelector and topologyKey both match, it's counted as a single term match - case when all terms have valid topologyKey", + }, + { + pod: &v1.Pod{ + ObjectMeta: metav1.ObjectMeta{Labels: map[string]string{"foo": "", "bar": ""}}, + }, + pods: []*v1.Pod{ + createPodWithAffinityTerms(defaultNamespace, "nodeA", nil, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "foo", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "labelA", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + }), + createPodWithAffinityTerms(defaultNamespace, "nodeB", nil, nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "bar", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "labelB", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + }), + }, + nodes: []*v1.Node{ + {ObjectMeta: metav1.ObjectMeta{Name: "nodeA", Labels: map[string]string{"region": "r1", "zone": "z1", "hostname": "nodeA"}}}, + {ObjectMeta: metav1.ObjectMeta{Name: "nodeB", Labels: map[string]string{"region": "r1", "zone": "z2", "hostname": "nodeB"}}}, + {ObjectMeta: metav1.ObjectMeta{Name: "nodeC", Labels: map[string]string{"region": "r1", "zone": "z3", "hostname": "nodeC"}}}, + }, + wantStatuses: []*framework.Status{unschedulable, unschedulable, nil}, + name: "Test existing pod's anti-affinity: existingPod on nodeA and nodeB has at least one anti-affinity term matches incoming pod, so incoming pod can only be scheduled to nodeC", + }, + { + pod: createPodWithAffinityTerms(defaultNamespace, "", nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "foo", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "region", + }, + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "bar", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + }, nil), + pods: []*v1.Pod{ + { + ObjectMeta: metav1.ObjectMeta{Name: "pod1", Labels: map[string]string{"foo": "", "bar": ""}}, + Spec: v1.PodSpec{ + NodeName: "nodeA", + }, + }, + }, + nodes: []*v1.Node{ + {ObjectMeta: metav1.ObjectMeta{Name: "nodeA", Labels: map[string]string{"region": "r1", "zone": "z1", "hostname": "nodeA"}}}, + {ObjectMeta: metav1.ObjectMeta{Name: "nodeB", Labels: map[string]string{"region": "r1", "zone": "z1", "hostname": "nodeB"}}}, + }, + wantStatuses: []*framework.Status{nil, nil}, + name: "Test incoming pod's affinity: firstly check if all affinityTerms match, and then check if all topologyKeys match", + }, + { + pod: createPodWithAffinityTerms(defaultNamespace, "", nil, + []v1.PodAffinityTerm{ + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "foo", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "region", + }, + { + LabelSelector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ + { + Key: "bar", + Operator: metav1.LabelSelectorOpExists, + }, + }, + }, + TopologyKey: "zone", + }, + }, nil), + pods: []*v1.Pod{ + { + ObjectMeta: metav1.ObjectMeta{Name: "pod1", Labels: map[string]string{"foo": ""}}, + Spec: v1.PodSpec{ + NodeName: "nodeA", + }, + }, + { + ObjectMeta: metav1.ObjectMeta{Name: "pod2", Labels: map[string]string{"bar": ""}}, + Spec: v1.PodSpec{ + NodeName: "nodeB", + }, + }, + }, + nodes: []*v1.Node{ + {ObjectMeta: metav1.ObjectMeta{Name: "nodeA", Labels: map[string]string{"region": "r1", "zone": "z1", "hostname": "nodeA"}}}, + {ObjectMeta: metav1.ObjectMeta{Name: "nodeB", Labels: map[string]string{"region": "r1", "zone": "z2", "hostname": "nodeB"}}}, + }, + wantStatuses: []*framework.Status{unschedulableAndUnresolvable, unschedulableAndUnresolvable}, + name: "Test incoming pod's affinity: firstly check if all affinityTerms match, and then check if all topologyKeys match, and the match logic should be satified on the same pod", + }, + } + + for indexTest, test := range tests { + t.Run(test.name, func(t *testing.T) { + nodeList := make([]v1.Node, len(test.nodes)) + for _, node := range test.nodes { + nodeList = append(nodeList, *node) + } + nodeListInfo := predicates.FakeNodeListInfo(nodeList) + nodeInfoMap := schedulernodeinfo.CreateNodeNameToInfoMap(test.pods, test.nodes) + for indexNode, node := range test.nodes { + meta := predicates.GetPredicateMetadata(test.pod, nodeInfoMap) + state := framework.NewCycleState() + state.Write(migration.PredicatesStateKey, &migration.PredicatesStateData{Reference: meta}) + + p := New(nodeListInfo, st.FakePodLister(test.pods)) + gotStatus := p.(framework.FilterPlugin).Filter(context.Background(), state, test.pod, nodeInfoMap[node.Name]) + if !reflect.DeepEqual(gotStatus, test.wantStatuses[indexNode]) { + t.Errorf("index: %d status does not match: %v, want: %v", indexTest, gotStatus, test.wantStatuses[indexNode]) + } + } + }) + } +} diff --git a/test/integration/scheduler/scheduler_test.go b/test/integration/scheduler/scheduler_test.go index 7b116b0f159..bd9280cbdb9 100644 --- a/test/integration/scheduler/scheduler_test.go +++ b/test/integration/scheduler/scheduler_test.go @@ -129,7 +129,6 @@ func TestSchedulerCreationFromConfigMap(t *testing.T) { "CheckNodeDiskPressure", "CheckNodeMemoryPressure", "CheckNodePIDPressure", - "MatchInterPodAffinity", "MaxAzureDiskVolumeCount", "MaxEBSVolumeCount", "MaxGCEPDVolumeCount", @@ -151,6 +150,7 @@ func TestSchedulerCreationFromConfigMap(t *testing.T) { {Name: "NodeVolumeLimits"}, {Name: "VolumeBinding"}, {Name: "VolumeZone"}, + {Name: "InterPodAffinity"}, }, "ScorePlugin": { {Name: "ImageLocality", Weight: 1}, @@ -203,7 +203,6 @@ kind: Policy "CheckNodeDiskPressure", "CheckNodeMemoryPressure", "CheckNodePIDPressure", - "MatchInterPodAffinity", "MaxAzureDiskVolumeCount", "MaxEBSVolumeCount", "MaxGCEPDVolumeCount", @@ -225,6 +224,7 @@ kind: Policy {Name: "NodeVolumeLimits"}, {Name: "VolumeBinding"}, {Name: "VolumeZone"}, + {Name: "InterPodAffinity"}, }, "ScorePlugin": { {Name: "ImageLocality", Weight: 1},