From c183ac16d1e402e821785289c584f2fe9377a131 Mon Sep 17 00:00:00 2001 From: ravisantoshgudimetla Date: Wed, 2 Dec 2020 09:32:46 +0530 Subject: [PATCH 1/2] make hostPort match test linuxonly --- test/e2e/scheduling/predicates.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test/e2e/scheduling/predicates.go b/test/e2e/scheduling/predicates.go index 6cadb51f0c6..f3b5434db4f 100644 --- a/test/e2e/scheduling/predicates.go +++ b/test/e2e/scheduling/predicates.go @@ -657,9 +657,14 @@ var _ = SIGDescribe("SchedulerPredicates [Serial]", 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. + if the HostIP or Protocol is different. This test is marked LinuxOnly since hostNetwork is not supported on + Windows. */ - framework.ConformanceIt("validates that there is no conflict between pods with same hostPort but different hostIP and protocol", func() { + + // TODO: Add a new e2e test to scheduler which validates if hostPort is working and move this test to e2e/network + // so that appropriate team owns the e2e. + // xref: https://github.com/kubernetes/kubernetes/issues/98075. + framework.ConformanceIt("validates that there is no conflict between pods with same hostPort but different hostIP and protocol [LinuxOnly]", func() { nodeName := GetNodeThatCanRunPod(f) localhost := "127.0.0.1" From 32c2ec5ceb79c26d3a0e3f5ff5c44e341f3439be Mon Sep 17 00:00:00 2001 From: ravisantoshgudimetla Date: Wed, 2 Dec 2020 14:42:30 +0530 Subject: [PATCH 2/2] conformance changes --- test/conformance/testdata/conformance.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index af99cf94677..6d301cc1336 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -2033,9 +2033,10 @@ - testname: Scheduling, HostPort matching and HostIP and Protocol not-matching codename: '[sig-scheduling] SchedulerPredicates [Serial] validates that there is no conflict between pods with same hostPort but different hostIP and protocol - [Conformance]' + [LinuxOnly] [Conformance]' description: Pods with the same HostPort value MUST be able to be scheduled to the - same node if the HostIP or Protocol is different. + same node if the HostIP or Protocol is different. This test is marked LinuxOnly + since hostNetwork is not supported on Windows. release: v1.16 file: test/e2e/scheduling/predicates.go - testname: Pod preemption verification