github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 10:43:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #29996 from kevin-wangzefeng/fix-scheduler-predicates-affinity-tests

Browse Source 
Automatic merge from submit-queue

fix creating pod from file failure in scheduler-predicates

fix #29816
ref https://github.com/kubernetes/kubernetes/pull/25584#discussion_r73349738 and https://github.com/kubernetes/kubernetes/pull/25584#discussion_r73349328
This commit is contained in:
Kubernetes Submit Queue 2016-08-03 12:55:26 -07:00 committed by GitHub
commit 5946bb2978
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/scheduler_predicates.go
View File

@ -696,7 +696,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
By("Trying to launch a pod that with NodeAffinity setting as embedded JSON string in the annotation value.")
labelPodName := "with-labels"
testPodPath := string(framework.ReadOrDie("test/e2e/testing-manifests/node-selection/pod-with-node-affinity.yaml"))
testPodPath := "test/e2e/testing-manifests/node-selection/pod-with-node-affinity.yaml"
framework.RunKubectlOrDie("create", "-f", testPodPath, fmt.Sprintf("--namespace=%v", ns))
// check that pod got scheduled. We intentionally DO NOT check that the
@ -1211,7 +1211,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
By("Trying to launch a pod that with PodAffinity & PodAntiAffinity setting as embedded JSON string in the annotation value.")
labelPodName := "with-newlabels"
testPodPath := string(framework.ReadOrDie("test/e2e/testing-manifests/node-selection/pos-with-node-affinity.yaml"))
testPodPath := "test/e2e/testing-manifests/node-selection/pod-with-pod-affinity.yaml"
framework.RunKubectlOrDie("create", "-f", testPodPath, fmt.Sprintf("--namespace=%v", ns))
// check that pod got scheduled. We intentionally DO NOT check that the