Sitelet https://github.com/hakman/kops/commit/2ea1da8da4e722d7bdc6db214c80237454b76e16
Skip to content

Commit 2ea1da8

Browse files
kubernetes-prow[bot]kubernetes-prow[bot]
authored
Merge pull request kubernetes#18616 from Jefftree/scale-max-unready-nodes
Tolerate unready nodes during scalability test validation
2 parents 36e26d8 + 808ed02 commit 2ea1da8

3 files changed

Lines changed: 8 additions & 0 deletions

File tree

‎tests/e2e/kubetest2-kops/deployer/deployer.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ type deployer struct {
6969
ValidationWait time.Duration `flag:"validation-wait" desc:"time to wait for newly created cluster to pass validation"`
7070
ValidationCount int `flag:"validation-count" desc:"how many times should a validation pass"`
7171
ValidationInterval time.Duration `flag:"validation-interval" desc:"time in duration to wait between validation attempts"`
72+
MaxUnreadyNodes int `flag:"max-unready-nodes" desc:"maximum number of non-ready worker nodes tolerated during validation, helpful to set when running scale tests"`
7273
MaxNodesToDump string `flag:"max-nodes-to-dump" desc:"max number of nodes to dump logs from, helpful to set when running scale tests"`
7374
NodeDumpTimeout time.Duration `flag:"node-dump-timeout" desc:"timeout for connecting to and dumping logs from a single node, helpful to raise when running scale tests"`
7475

‎tests/e2e/kubetest2-kops/deployer/up.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,9 @@ func (d *deployer) IsUp() (bool, error) {
384384
if d.ValidationInterval > 10*time.Second {
385385
args = append(args, "--interval", d.ValidationInterval.String())
386386
}
387+
if d.MaxUnreadyNodes > 0 {
388+
args = append(args, "--max-unready-nodes", strconv.Itoa(d.MaxUnreadyNodes))
389+
}
387390
klog.Info(strings.Join(args, " "))
388391

389392
cmd := exec.Command(args[0], args[1:]...)

‎tests/e2e/scenarios/scalability/run-test.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,10 @@ KUBETEST2_ARGS=()
160160
KUBETEST2_ARGS+=("-v=2")
161161
KUBETEST2_ARGS+=("--max-nodes-to-dump=${MAX_NODES_TO_DUMP:-5}")
162162
KUBETEST2_ARGS+=("--node-dump-timeout=${NODE_DUMP_TIMEOUT:-5m}")
163+
# Tolerate up to 2 nodes failing to join on 5k clusters.
164+
if [[ "${KUBE_NODE_COUNT:-100}" -ge 5000 ]]; then
165+
KUBETEST2_ARGS+=("--max-unready-nodes=${MAX_UNREADY_NODES:-2}")
166+
fi
163167
KUBETEST2_ARGS+=("--cloud-provider=${CLOUD_PROVIDER}")
164168
KUBETEST2_ARGS+=("--cluster-name=${CLUSTER_NAME:-}")
165169
KUBETEST2_ARGS+=("--admin-access=${ADMIN_ACCESS:-}")

0 commit comments

Comments
 (0)