github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 11:21:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #97003 from ravisantoshgudimetla/remove-scheduler-preemption-test-from-conformance

Browse Source 
make hostPort match test linuxonly
This commit is contained in:
Kubernetes Prow Robot 2021-01-14 19:39:51 -08:00 committed by GitHub
commit 33ee864e92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/conformance/testdata/conformance.yaml vendored
View File

@ -2033,9 +2033,10 @@
- testname: Scheduling, HostPort matching and HostIP and Protocol not-matching - testname: Scheduling, HostPort matching and HostIP and Protocol not-matching
codename: '[sig-scheduling] SchedulerPredicates [Serial] validates that there is codename: '[sig-scheduling] SchedulerPredicates [Serial] validates that there is
no conflict between pods with same hostPort but different hostIP and protocol 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 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 release: v1.16
file: test/e2e/scheduling/predicates.go file: test/e2e/scheduling/predicates.go
- testname: Pod preemption verification - testname: Pod preemption verification

9
test/e2e/scheduling/predicates.go
View File

@ -657,9 +657,14 @@ var _ = SIGDescribe("SchedulerPredicates [Serial]", func() {
Release: v1.16 Release: v1.16
Testname: Scheduling, HostPort matching and HostIP and Protocol not-matching 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 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) nodeName := GetNodeThatCanRunPod(f)
localhost := "127.0.0.1" localhost := "127.0.0.1"