@@ -578,19 +578,20 @@ func TestZoneSelectorSpreadPriority(t *testing.T) {
578
578
pods : []* v1.Pod {
579
579
buildPod (nodeMachine1Zone1 , labels1 , nil ),
580
580
buildPod (nodeMachine1Zone2 , labels1 , nil ),
581
- buildPod (nodeMachine1Zone3 , labels1 , nil ),
581
+ buildPod (nodeMachine2Zone2 , labels1 , nil ),
582
582
buildPod (nodeMachine2Zone2 , labels2 , nil ),
583
+ buildPod (nodeMachine1Zone3 , labels1 , nil ),
583
584
},
584
585
services : []* v1.Service {{Spec : v1.ServiceSpec {Selector : labels1 }}},
585
586
expectedList : []framework.NodeScore {
586
- {Name : nodeMachine1Zone1 , Score : 0 }, // Pod on node
587
+ {Name : nodeMachine1Zone1 , Score : 33 }, // Pod on node
587
588
{Name : nodeMachine1Zone2 , Score : 0 }, // Pod on node
588
- {Name : nodeMachine2Zone2 , Score : 33 }, // Pod in zone
589
- {Name : nodeMachine1Zone3 , Score : 0 }, // Pod on node
590
- {Name : nodeMachine2Zone3 , Score : 33 }, // Pod in zone
591
- {Name : nodeMachine3Zone3 , Score : 33 }, // Pod in zone
589
+ {Name : nodeMachine2Zone2 , Score : 0 }, // Pod in zone
590
+ {Name : nodeMachine1Zone3 , Score : 33 }, // Pod on node
591
+ {Name : nodeMachine2Zone3 , Score : 66 }, // Pod in zone
592
+ {Name : nodeMachine3Zone3 , Score : 66 }, // Pod in zone
592
593
},
593
- name : "four pods, 3 matching (z1=1, z2=1 , z3=1)" ,
594
+ name : "five pods, 4 matching (z1=1, z2=2 , z3=1)" ,
594
595
},
595
596
{
596
597
pod : buildPod ("" , labels1 , controllerRef ("ReplicationController" , "name" , "abc123" )),
0 commit comments