github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #20725 from mesosphere/jdef_node_affinity_is_not_conformance 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2016-02-09 02:35:56 -08:00
parent 68a165cda9 457fb0382e
commit f637f08774
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/scheduler_predicates.go
View File

@ -395,7 +395,7 @@ var _ = Describe("SchedulerPredicates [Serial]", func() {
cleanupPods(c, ns)
})
It("validates that a pod with an invalid Affinity is rejected [Conformance]", func() {
It("validates that a pod with an invalid NodeAffinity is rejected [Feature:NodeAffinity]", func() {
By("Trying to launch a pod with an invalid Affinity data.")
podName := "without-label"
@ -519,7 +519,7 @@ var _ = Describe("SchedulerPredicates [Serial]", func() {
// Test Nodes does not have any label, hence it should be impossible to schedule Pod with
// non-nil NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.
It("validates that NodeAffinity is respected if not matching [Conformance]", func() {
It("validates that NodeAffinity is respected if not matching [Feature:NodeAffinity]", func() {
By("Trying to schedule Pod with nonempty NodeSelector.")
podName := "restricted-pod"
@ -575,7 +575,7 @@ var _ = Describe("SchedulerPredicates [Serial]", func() {
// Keep the same steps with the test on NodeSelector,
// but specify Affinity in Pod.Annotations, instead of NodeSelector.
It("validates that required NodeAffinity setting is respected if matching [Conformance]", func() {
It("validates that required NodeAffinity setting is respected if matching [Feature:NodeAffinity]", func() {
// launch a pod to find a node which can launch a pod. We intentionally do
// not just take the node list and choose the first of them. Depending on the
// cluster and the scheduler it might be that a "normal" pod cannot be
@ -669,7 +669,7 @@ var _ = Describe("SchedulerPredicates [Serial]", func() {
})
// Verify that an escaped JSON string of NodeAffinity in a YAML PodSpec works.
It("validates that embedding the JSON NodeAffinity setting as a string in the annotation value work [Conformance]", func() {
It("validates that embedding the JSON NodeAffinity setting as a string in the annotation value work [Feature:NodeAffinity]", func() {
// launch a pod to find a node which can launch a pod. We intentionally do
// not just take the node list and choose the first of them. Depending on the
// cluster and the scheduler it might be that a "normal" pod cannot be