From faf5cda04651cfa7aed715d11d4bed2479fd3feb Mon Sep 17 00:00:00 2001 From: globervinodhn Date: Fri, 24 May 2019 11:33:16 +0530 Subject: [PATCH] Promote existing E2Es for hostport/HostIP resolution to conformance --- test/conformance/testdata/conformance.txt | 2 ++ test/e2e/scheduling/predicates.go | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/test/conformance/testdata/conformance.txt b/test/conformance/testdata/conformance.txt index 278c8ff71fb..cf7e918662a 100644 --- a/test/conformance/testdata/conformance.txt +++ b/test/conformance/testdata/conformance.txt @@ -206,6 +206,8 @@ test/e2e/node/pre_stop.go: "should call prestop when killing a pod" test/e2e/scheduling/predicates.go: "validates resource limits of pods that are allowed to run" test/e2e/scheduling/predicates.go: "validates that NodeSelector is respected if not matching" test/e2e/scheduling/predicates.go: "validates that NodeSelector is respected if matching" +test/e2e/scheduling/predicates.go: "validates that there is no conflict between pods with same hostPort but different hostIP and protocol" +test/e2e/scheduling/predicates.go: "validates that there exists conflict between pods with same hostPort and protocol but one using 0.0.0.0 hostIP" test/e2e/storage/empty_dir_wrapper.go: "should not conflict" test/e2e/storage/empty_dir_wrapper.go: "should not cause race condition when used for configmaps" test/e2e/storage/subpath.go: "should support subpaths with secret pod" diff --git a/test/e2e/scheduling/predicates.go b/test/e2e/scheduling/predicates.go index b7b5a5a7883..da5c5e14b14 100644 --- a/test/e2e/scheduling/predicates.go +++ b/test/e2e/scheduling/predicates.go @@ -554,7 +554,13 @@ var _ = SIGDescribe("SchedulerPredicates [Serial]", func() { verifyResult(cs, 1, 0, ns) }) - ginkgo.It("validates that there is no conflict between pods with same hostPort but different hostIP and protocol", func() { + /* + Release : v1.16 + Testname: Scheduling, HostPort matching and HostIP and Protocol not-matching + Description: Pods with the same HostPort value MUST be able to be scheduled to the same node + if the HostIP or Protocol is different. + */ + framework.ConformanceIt("validates that there is no conflict between pods with same hostPort but different hostIP and protocol", func() { nodeName := GetNodeThatCanRunPod(f) @@ -581,7 +587,13 @@ var _ = SIGDescribe("SchedulerPredicates [Serial]", func() { createHostPortPodOnNode(f, "pod3", ns, "127.0.0.2", port, v1.ProtocolUDP, nodeSelector, true) }) - ginkgo.It("validates that there exists conflict between pods with same hostPort and protocol but one using 0.0.0.0 hostIP", func() { + /* + Release : v1.16 + Testname: Scheduling, HostPort and Protocol match, HostIPs different but one is default HostIP (0.0.0.0) + Description: Pods with the same HostPort and Protocol, but different HostIPs, MUST NOT schedule to the + same node if one of those IPs is the default HostIP of 0.0.0.0, which represents all IPs on the host. + */ + framework.ConformanceIt("validates that there exists conflict between pods with same hostPort and protocol but one using 0.0.0.0 hostIP", func() { nodeName := GetNodeThatCanRunPod(f) // use nodeSelector to make sure the testing pods get assigned on the same node to explicitly verify there exists conflict or not