Merge pull request #88552 from Huang-Wei/sched-e2e-flake-part1

Fix a scheduler e2e bug on PodTopologySpread scoring
This commit is contained in:
Kubernetes Prow Robot 2020-02-25 21:02:54 -08:00 committed by GitHub
commit b6b494b448
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -378,7 +378,7 @@ var _ = SIGDescribe("SchedulerPriorities [Serial]", func() {
PodConfig: pausePodConfig{
Name: podLabel,
Namespace: ns,
Labels: map[string]string{podLabel: ""},
Labels: map[string]string{podLabel: "foo"},
NodeSelector: map[string]string{topologyKey: nodeNames[0]},
},
}
@ -388,7 +388,9 @@ var _ = SIGDescribe("SchedulerPriorities [Serial]", func() {
podCfg := pausePodConfig{
Name: "test-pod",
Namespace: ns,
Labels: map[string]string{podLabel: ""},
// The labels shouldn't match the preceding ReplicaSet, otherwise it will
// be claimed as orphan of the ReplicaSet.
Labels: map[string]string{podLabel: "bar"},
Affinity: &v1.Affinity{
NodeAffinity: &v1.NodeAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: &v1.NodeSelector{