mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
Merge pull request #53389 from leblancd/v6_e2e_iperf
Automatic merge from submit-queue (batch tested with PRs 53345, 53389). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Add IPv6 option for e2e iPerf test The e2e iPerf test case currently only runs in IPv4 mode. This change adds an option to run an iPerf test in IPv6 mode (i.e. by running iPerf with a "-V" command line flag), so that the test can be run on IPv6-only clusters. **What this PR does / why we need it**: This change adds an option to run an iPerf test in IPv6 mode (i.e. by running iPerf with a "-V" command line flag), so that the test can be run on IPv6-only clusters. It also adds a Feature tag to the current IPv4 iPerf test so that it can be disabled when running e2e tests on an IPv6-only cluster. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #53388 **Special notes for your reviewer**: Please let me know if there are better "Feature:" tags to use for selecting whether to run the IPv4 vs IPv6 test case. **Release note**: ```release-note NONE ```
This commit is contained in:
commit
0690df3fc5
@ -36,9 +36,8 @@ const (
|
||||
smallClusterTimeout = 200 * time.Second
|
||||
)
|
||||
|
||||
// Declared as Flakey since it has not been proven to run in parallel on small nodes or slow networks in CI
|
||||
// TODO jayunit100 : Retag this test according to semantics from #22401
|
||||
var _ = SIGDescribe("Networking IPerf [Experimental] [Slow] [Feature:Networking-Performance]", func() {
|
||||
// networkingIPerf test runs iperf on a container in either IPv4 or IPv6 mode.
|
||||
func networkingIPerfTest(isIPv6 bool) {
|
||||
|
||||
f := framework.NewDefaultFramework("network-perf")
|
||||
|
||||
@ -49,6 +48,11 @@ var _ = SIGDescribe("Networking IPerf [Experimental] [Slow] [Feature:Networking-
|
||||
numServer := 1
|
||||
maxBandwidthBits := gceBandwidthBitsEstimate
|
||||
|
||||
familyStr := ""
|
||||
if isIPv6 {
|
||||
familyStr = "-V "
|
||||
}
|
||||
|
||||
It(fmt.Sprintf("should transfer ~ 1GB onto the service endpoint %v servers (maximum of %v clients)", numServer, numClient), func() {
|
||||
nodes := framework.GetReadySchedulableNodesOrDie(f.ClientSet)
|
||||
totalPods := len(nodes.Items)
|
||||
@ -68,7 +72,7 @@ var _ = SIGDescribe("Networking IPerf [Experimental] [Slow] [Feature:Networking-
|
||||
Args: []string{
|
||||
"/bin/sh",
|
||||
"-c",
|
||||
"/usr/local/bin/iperf -s -p 8001 ",
|
||||
"/usr/local/bin/iperf " + familyStr + "-s -p 8001 ",
|
||||
},
|
||||
Ports: []v1.ContainerPort{{ContainerPort: 8001}},
|
||||
}},
|
||||
@ -96,7 +100,7 @@ var _ = SIGDescribe("Networking IPerf [Experimental] [Slow] [Feature:Networking-
|
||||
Args: []string{
|
||||
"/bin/sh",
|
||||
"-c",
|
||||
"/usr/local/bin/iperf -c service-for-" + appName + " -p 8002 --reportstyle C && sleep 5",
|
||||
"/usr/local/bin/iperf " + familyStr + "-c service-for-" + appName + " -p 8002 --reportstyle C && sleep 5",
|
||||
},
|
||||
},
|
||||
},
|
||||
@ -153,4 +157,16 @@ var _ = SIGDescribe("Networking IPerf [Experimental] [Slow] [Feature:Networking-
|
||||
framework.Logf("%v had bandwidth %v. Ratio to expected (%v) was %f", ipClient, bandwidth, expectedBandwidth, float64(bandwidth)/float64(expectedBandwidth))
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// Declared as Flakey since it has not been proven to run in parallel on small nodes or slow networks in CI
|
||||
// TODO jayunit100 : Retag this test according to semantics from #22401
|
||||
var _ = SIGDescribe("Networking IPerf IPv4 [Experimental] [Feature:Networking-IPv4] [Slow] [Feature:Networking-Performance]", func() {
|
||||
networkingIPerfTest(false)
|
||||
})
|
||||
|
||||
// Declared as Flakey since it has not been proven to run in parallel on small nodes or slow networks in CI
|
||||
// TODO jayunit100 : Retag this test according to semantics from #22401
|
||||
var _ = SIGDescribe("Networking IPerf IPv6 [Experimental] [Feature:Networking-IPv6] [Slow] [Feature:Networking-Performance]", func() {
|
||||
networkingIPerfTest(true)
|
||||
})
|
||||
|
Loading…
Reference in New Issue
Block a user