From ee7ee856693b8e2c3c5aec94f1085476c74052a2 Mon Sep 17 00:00:00 2001 From: Stephen Heywood Date: Wed, 10 Feb 2021 13:32:58 +1300 Subject: [PATCH] Update conformance metadata for relocated test --- test/conformance/testdata/conformance.yaml | 2 +- test/e2e/network/hostport.go | 2 +- test/e2e/scheduling/predicates.go | 7 ------- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index 6297f62a917..0dd6e50e53a 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -1627,7 +1627,7 @@ description: Pods with the same HostPort value MUST be able to be scheduled to the same node if the HostIP or Protocol is different. This test is marked LinuxOnly since hostNetwork is not supported on Windows. - release: v1.16, v1.20 + release: v1.16, v1.21 file: test/e2e/network/hostport.go - testname: Ingress API codename: '[sig-network] Ingress API should support creating Ingress API operations diff --git a/test/e2e/network/hostport.go b/test/e2e/network/hostport.go index 20bfd90ef9b..c19ce8e639c 100644 --- a/test/e2e/network/hostport.go +++ b/test/e2e/network/hostport.go @@ -49,7 +49,7 @@ var _ = SIGDescribe("HostPort", func() { }) /* - Release: v1.16, v1.20 + Release: v1.16, v1.21 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. This test is marked LinuxOnly since hostNetwork is not supported on diff --git a/test/e2e/scheduling/predicates.go b/test/e2e/scheduling/predicates.go index 77e6e0a950e..3dc801b79d7 100644 --- a/test/e2e/scheduling/predicates.go +++ b/test/e2e/scheduling/predicates.go @@ -651,13 +651,6 @@ var _ = SIGDescribe("SchedulerPredicates [Serial]", func() { verifyResult(cs, 1, 0, ns) }) - /* - 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. This test doesn´t test the HostPort functionality. - xref: https://github.com/kubernetes/kubernetes/issues/98075 - */ ginkgo.It("validates that there is no conflict between pods with same hostPort but different hostIP and protocol", func() { nodeName := GetNodeThatCanRunPod(f)