Skip to content

K
k3s
Commit e02cad4a authored by Jeff Lowdermilk's avatar Jeff Lowdermilk
Browse files
Options

Merge pull request #25564 from davidopp/fix-pod-affinity-test

Move test input files from test/e2e/node-selection/ to test/e2e/testing-manifests/
parents 24c46acd dd70a5e5
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
test/e2e/scheduler_predicates.go
View file @ e02cad4a
...@@ -718,7 +718,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() { ...@@ -718,7 +718,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.") By("Trying to launch a pod that with NodeAffinity setting as embedded JSON string in the annotation value.")
labelPodName := "with-labels" labelPodName := "with-labels"
nodeSelectionRoot := filepath.Join(framework.TestContext.RepoRoot, "test/e2e/node-selection") nodeSelectionRoot := filepath.Join(framework.TestContext.RepoRoot, "test/e2e/testing-manifests/node-selection")
testPodPath := filepath.Join(nodeSelectionRoot, "pod-with-node-affinity.yaml") testPodPath := filepath.Join(nodeSelectionRoot, "pod-with-node-affinity.yaml")
framework.RunKubectlOrDie("create", "-f", testPodPath, fmt.Sprintf("--namespace=%v", ns)) framework.RunKubectlOrDie("create", "-f", testPodPath, fmt.Sprintf("--namespace=%v", ns))
defer c.Pods(ns).Delete(labelPodName, api.NewDeleteOptions(0)) defer c.Pods(ns).Delete(labelPodName, api.NewDeleteOptions(0))
...@@ -1265,7 +1265,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() { ...@@ -1265,7 +1265,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.") By("Trying to launch a pod that with PodAffinity & PodAntiAffinity setting as embedded JSON string in the annotation value.")
labelPodName := "with-newlabels" labelPodName := "with-newlabels"
nodeSelectionRoot := filepath.Join(framework.TestContext.RepoRoot, "test/e2e/node-selection") nodeSelectionRoot := filepath.Join(framework.TestContext.RepoRoot, "test/e2e/testing-manifests/node-selection")
testPodPath := filepath.Join(nodeSelectionRoot, "pod-with-pod-affinity.yaml") testPodPath := filepath.Join(nodeSelectionRoot, "pod-with-pod-affinity.yaml")
framework.RunKubectlOrDie("create", "-f", testPodPath, fmt.Sprintf("--namespace=%v", ns)) framework.RunKubectlOrDie("create", "-f", testPodPath, fmt.Sprintf("--namespace=%v", ns))
defer c.Pods(ns).Delete(labelPodName, api.NewDeleteOptions(0)) defer c.Pods(ns).Delete(labelPodName, api.NewDeleteOptions(0))
......
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