Skip to content

K
k3s
Commit 5946bb29 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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

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
parents 6b523ce6 3491a18b
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
test/e2e/scheduler_predicates.go
View file @ 5946bb29
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment