Skip to content

K
k3s
Unverified Commit 8182501b authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #60740 from msau42/local-e2es

Automatic merge from submit-queue (batch tested with PRs 60159, 60731, 60720, 60736, 60740). 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>. Cap max number of nodes to use for local PV e2e tests **What this PR does / why we need it**: Large scale tests have thousands of nodes, which will make some local PV tests that use each node take forever **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Partially addresses #60589 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
parents 21ac7b4b c4851c06
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 1 deletion
test/e2e/storage/persistent_volumes-local.go
View file @ 8182501b
...@@ -135,6 +135,9 @@ const ( ...@@ -135,6 +135,9 @@ const (
// A sample request size // A sample request size
testRequestSize = "10Mi" testRequestSize = "10Mi"
// Max number of nodes to use for testing
maxNodes = 5
) )
var ( var (
...@@ -159,6 +162,13 @@ var _ = utils.SIGDescribe("PersistentVolumes-local ", func() { ...@@ -159,6 +162,13 @@ var _ = utils.SIGDescribe("PersistentVolumes-local ", func() {
// Get all the schedulable nodes // Get all the schedulable nodes
nodes := framework.GetReadySchedulableNodesOrDie(f.ClientSet) nodes := framework.GetReadySchedulableNodesOrDie(f.ClientSet)
Expect(len(nodes.Items)).NotTo(BeZero(), "No available nodes for scheduling") Expect(len(nodes.Items)).NotTo(BeZero(), "No available nodes for scheduling")
// Cap max number of nodes
maxLen := len(nodes.Items)
if maxLen > maxNodes {
maxLen = maxNodes
}
scName = fmt.Sprintf("%v-%v", testSCPrefix, f.Namespace.Name) scName = fmt.Sprintf("%v-%v", testSCPrefix, f.Namespace.Name)
// Choose the first node // Choose the first node
node0 := &nodes.Items[0] node0 := &nodes.Items[0]
...@@ -167,7 +177,7 @@ var _ = utils.SIGDescribe("PersistentVolumes-local ", func() { ...@@ -167,7 +177,7 @@ var _ = utils.SIGDescribe("PersistentVolumes-local ", func() {
config = &localTestConfig{ config = &localTestConfig{
ns: f.Namespace.Name, ns: f.Namespace.Name,
client: f.ClientSet, client: f.ClientSet,
nodes: nodes.Items, nodes: nodes.Items[:maxLen],
node0: node0, node0: node0,
scName: scName, scName: scName,
ssTester: ssTester, ssTester: ssTester,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment