github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-30 13:19:35 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
parent ddf53b8f66 5da37d5b5e
commit b6b494b448
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/scheduling/priorities.go
View File

@@ -378,7 +378,7 @@ var _ = SIGDescribe("SchedulerPriorities [Serial]", func() {
PodConfig: pausePodConfig{ PodConfig: pausePodConfig{
Name: podLabel, Name: podLabel,
Namespace: ns, Namespace: ns,
Labels: map[string]string{podLabel: ""}, Labels: map[string]string{podLabel: "foo"},
NodeSelector: map[string]string{topologyKey: nodeNames[0]}, NodeSelector: map[string]string{topologyKey: nodeNames[0]},
}, },
} }
@@ -388,7 +388,9 @@ var _ = SIGDescribe("SchedulerPriorities [Serial]", func() {
podCfg := pausePodConfig{ podCfg := pausePodConfig{
Name: "test-pod", Name: "test-pod",
Namespace: ns, 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{ Affinity: &v1.Affinity{
NodeAffinity: &v1.NodeAffinity{ NodeAffinity: &v1.NodeAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: &v1.NodeSelector{ RequiredDuringSchedulingIgnoredDuringExecution: &v1.NodeSelector{