Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix conformance metadata release 1.20 #99081

Merged
merged 2 commits into from Feb 18, 2021
Merged

Fix conformance metadata release 1.20 #99081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6698a4e
Revert "conformance changes"
heyste Feb 14, 2021
b570189
Revert "make hostPort match test linuxonly"
heyste Feb 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions test/conformance/testdata/conformance.yaml
View file
Open in desktop
Expand Up @@ -2033,10 +2033,9 @@
- 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
[LinuxOnly] [Conformance]'
[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. This test is marked LinuxOnly
since hostNetwork is not supported on Windows.
same node if the HostIP or Protocol is different.
release: v1.16
file: test/e2e/scheduling/predicates.go
- testname: Pod preemption verification
Expand Down
9 changes: 2 additions & 7 deletions test/e2e/scheduling/predicates.go
View file
Open in desktop
Expand Up @@ -657,14 +657,9 @@ 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. This test is marked LinuxOnly since hostNetwork is not supported on
Windows.
if the HostIP or Protocol is different.
*/

// 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() {
framework.ConformanceIt("validates that there is no conflict between pods with same hostPort but different hostIP and protocol", func() {

nodeName := GetNodeThatCanRunPod(f)
localhost := "127.0.0.1"
Expand Down