From d7f405f65a8bfc66673e9171d59dd959efb81970 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Fri, 25 Jun 2021 20:30:07 +0300 Subject: [PATCH] Decrease default values for net.ipv4.tcp_rmem and net.ipv4.tcp_wmem --- nodeup/pkg/model/sysctls.go | 5 +++-- pkg/model/bootstrapscript.go | 14 ++++++++++++- pkg/model/tests/data/bootstrapscript_0.txt | 5 ++++- pkg/model/tests/data/bootstrapscript_1.txt | 5 ++++- pkg/model/tests/data/bootstrapscript_2.txt | 5 ++++- pkg/model/tests/data/bootstrapscript_3.txt | 5 ++++- pkg/model/tests/data/bootstrapscript_4.txt | 5 ++++- pkg/model/tests/data/bootstrapscript_5.txt | 5 ++++- .../cloudformation.json.extracted.yaml | 15 +++++++++++--- ...t-1a.masters.minimal.example.com_user_data | 5 ++++- ...mplate_nodes.minimal.example.com_user_data | 5 ++++- ...ters.bastionuserdata.example.com_user_data | 5 ++++- ...odes.bastionuserdata.example.com_user_data | 5 ++++- .../cloudformation.json.extracted.yaml | 10 ++++++++-- ...t-1a.masters.complex.example.com_user_data | 5 ++++- ...mplate_nodes.complex.example.com_user_data | 5 ++++- ...-1a.masters.compress.example.com_user_data | 5 ++++- ...plate_nodes.compress.example.com_user_data | 5 ++++- .../cloudformation.json.extracted.yaml | 10 ++++++++-- .../cloudformation.json.extracted.yaml | 10 ++++++++-- .../cloudformation.json.extracted.yaml | 10 ++++++++-- ...masters.existing-iam.example.com_user_data | 5 ++++- ...masters.existing-iam.example.com_user_data | 5 ++++- ...masters.existing-iam.example.com_user_data | 5 ++++- ...e_nodes.existing-iam.example.com_user_data | 5 ++++- .../cloudformation.json.extracted.yaml | 10 ++++++++-- ...a.masters.existingsg.example.com_user_data | 5 ++++- ...b.masters.existingsg.example.com_user_data | 5 ++++- ...c.masters.existingsg.example.com_user_data | 5 ++++- ...ate_nodes.existingsg.example.com_user_data | 5 ++++- .../cloudformation.json.extracted.yaml | 10 ++++++++-- ...a.masters.externallb.example.com_user_data | 5 ++++- ...ate_nodes.externallb.example.com_user_data | 5 ++++- ...ers.externalpolicies.example.com_user_data | 5 ++++- ...des.externalpolicies.example.com_user_data | 5 ++++- ...s-test-1a.masters.ha.example.com_user_data | 5 ++++- ...s-test-1b.masters.ha.example.com_user_data | 5 ++++- ...s-test-1c.masters.ha.example.com_user_data | 5 ++++- ...ch_template_nodes.ha.example.com_user_data | 5 ++++- ...ha-gce-example-com_metadata_startup-script | 5 ++++- ...ha-gce-example-com_metadata_startup-script | 5 ++++- ...ha-gce-example-com_metadata_startup-script | 5 ++++- ...ha-gce-example-com_metadata_startup-script | 5 ++++- ...t-1a.masters.minimal.example.com_user_data | 5 ++++- ...mplate_nodes.minimal.example.com_user_data | 5 ++++- ...t-1a.masters.minimal.example.com_user_data | 5 ++++- ...mplate_nodes.minimal.example.com_user_data | 5 ++++- .../cloudformation.json.extracted.yaml | 10 ++++++++-- .../cloudformation.json.extracted.yaml | 10 ++++++++-- ...t-1a.masters.minimal.example.com_user_data | 5 ++++- ...mplate_nodes.minimal.example.com_user_data | 5 ++++- .../cloudformation.json.extracted.yaml | 10 ++++++++-- ...masters.minimal-ipv6.example.com_user_data | 5 ++++- ...e_nodes.minimal-ipv6.example.com_user_data | 5 ++++- ...masters.minimal-json.example.com_user_data | 5 ++++- ...e_nodes.minimal-json.example.com_user_data | 5 ++++- ...ers.minimal-warmpool.example.com_user_data | 5 ++++- ...des.minimal-warmpool.example.com_user_data | 5 ++++- .../cloudformation.json.extracted.yaml | 10 ++++++++-- ...t-1a.masters.minimal.example.com_user_data | 5 ++++- ...mplate_nodes.minimal.example.com_user_data | 5 ++++- ...al-gce-example-com_metadata_startup-script | 5 ++++- ...al-gce-example-com_metadata_startup-script | 5 ++++- ...rivate-example-com_metadata_startup-script | 5 ++++- ...rivate-example-com_metadata_startup-script | 5 ++++- ...est-1a.masters.minimal.k8s.local_user_data | 5 ++++- ...template_nodes.minimal.k8s.local_user_data | 5 ++++- .../cloudformation.json.extracted.yaml | 20 +++++++++++++++---- ...sters.mixedinstances.example.com_user_data | 5 ++++- ...sters.mixedinstances.example.com_user_data | 5 ++++- ...sters.mixedinstances.example.com_user_data | 5 ++++- ...nodes.mixedinstances.example.com_user_data | 5 ++++- .../cloudformation.json.extracted.yaml | 20 +++++++++++++++---- ...sters.mixedinstances.example.com_user_data | 5 ++++- ...sters.mixedinstances.example.com_user_data | 5 ++++- ...sters.mixedinstances.example.com_user_data | 5 ++++- ...nodes.mixedinstances.example.com_user_data | 5 ++++- .../cloudformation.json.extracted.yaml | 10 ++++++++-- ...ters.nthsqsresources.example.com_user_data | 5 ++++- ...odes.nthsqsresources.example.com_user_data | 5 ++++- .../cloudformation.json.extracted.yaml | 10 ++++++++-- ...rs.private-shared-ip.example.com_user_data | 5 ++++- ...es.private-shared-ip.example.com_user_data | 5 ++++- ...rivate-shared-subnet.example.com_user_data | 5 ++++- ...rivate-shared-subnet.example.com_user_data | 5 ++++- .../cloudformation.json.extracted.yaml | 10 ++++++++-- ...asters.privatecalico.example.com_user_data | 5 ++++- ..._nodes.privatecalico.example.com_user_data | 5 ++++- ...masters.privatecanal.example.com_user_data | 5 ++++- ...e_nodes.privatecanal.example.com_user_data | 5 ++++- .../cloudformation.json.extracted.yaml | 10 ++++++++-- ...asters.privatecilium.example.com_user_data | 5 ++++- ..._nodes.privatecilium.example.com_user_data | 5 ++++- .../cloudformation.json.extracted.yaml | 10 ++++++++-- ...asters.privatecilium.example.com_user_data | 5 ++++- ..._nodes.privatecilium.example.com_user_data | 5 ++++- .../cloudformation.json.extracted.yaml | 10 ++++++++-- ...rivateciliumadvanced.example.com_user_data | 5 ++++- ...rivateciliumadvanced.example.com_user_data | 5 ++++- ....masters.privatedns1.example.com_user_data | 5 ++++- ...te_nodes.privatedns1.example.com_user_data | 5 ++++- ....masters.privatedns2.example.com_user_data | 5 ++++- ...te_nodes.privatedns2.example.com_user_data | 5 ++++- ...sters.privateflannel.example.com_user_data | 5 ++++- ...nodes.privateflannel.example.com_user_data | 5 ++++- ...asters.privatekopeio.example.com_user_data | 5 ++++- ..._nodes.privatekopeio.example.com_user_data | 5 ++++- ...masters.privateweave.example.com_user_data | 5 ++++- ...e_nodes.privateweave.example.com_user_data | 5 ++++- ...t-1a.masters.minimal.example.com_user_data | 5 ++++- ...mplate_nodes.minimal.example.com_user_data | 5 ++++- ...masters.sharedsubnet.example.com_user_data | 5 ++++- ...e_nodes.sharedsubnet.example.com_user_data | 5 ++++- ...1a.masters.sharedvpc.example.com_user_data | 5 ++++- ...late_nodes.sharedvpc.example.com_user_data | 5 ++++- ...1a.masters.unmanaged.example.com_user_data | 5 ++++- ...late_nodes.unmanaged.example.com_user_data | 5 ++++- ...t-1a.masters.minimal.example.com_user_data | 5 ++++- ...mplate_nodes.minimal.example.com_user_data | 5 ++++- 119 files changed, 580 insertions(+), 144 deletions(-) diff --git a/nodeup/pkg/model/sysctls.go b/nodeup/pkg/model/sysctls.go index 8e3ed7976ea79..b5b2496fbe0bd 100644 --- a/nodeup/pkg/model/sysctls.go +++ b/nodeup/pkg/model/sysctls.go @@ -63,6 +63,7 @@ func (b *SysctlBuilder) Build(c *fi.ModelBuilderContext) error { "") // See https://github.com/kubernetes/kube-deploy/issues/261 + // and https://github.com/kubernetes/kops/issues/10206 sysctls = append(sysctls, "# Increase the number of connections", "net.core.somaxconn = 32768", @@ -77,8 +78,8 @@ func (b *SysctlBuilder) Build(c *fi.ModelBuilderContext) error { "", "# Increase the maximum total buffer-space allocatable", - "net.ipv4.tcp_wmem = 4096 12582912 16777216", - "net.ipv4.tcp_rmem = 4096 12582912 16777216", + "net.ipv4.tcp_wmem = 4096 87380 16777216", + "net.ipv4.tcp_rmem = 4096 87380 16777216", "", "# Increase the number of outstanding syn requests allowed", diff --git a/pkg/model/bootstrapscript.go b/pkg/model/bootstrapscript.go index 20f634c5d1b9f..38a80daf19352 100644 --- a/pkg/model/bootstrapscript.go +++ b/pkg/model/bootstrapscript.go @@ -390,7 +390,7 @@ func (b *BootstrapScript) Run(c *fi.Context) error { "SetSysctls": func() string { // By setting some sysctls early, we avoid broken configurations that prevent nodeup download. // See https://github.com/kubernetes/kops/issues/10206 for details. - return "sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true\n" + return setSysctls() }, } @@ -477,3 +477,15 @@ func gzipBase64(data string) (string, error) { return base64.StdEncoding.EncodeToString(b.Bytes()), nil } + +func setSysctls() string { + var b bytes.Buffer + + // Based on https://github.com/kubernetes/kops/issues/10206#issuecomment-766852332 + b.WriteString("sysctl -w net.core.rmem_max=16777216 || true\n") + b.WriteString("sysctl -w net.core.wmem_max=16777216 || true\n") + b.WriteString("sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true\n") + b.WriteString("sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true\n") + + return b.String() +} diff --git a/pkg/model/tests/data/bootstrapscript_0.txt b/pkg/model/tests/data/bootstrapscript_0.txt index aeb4d7d429f47..e478790860a23 100644 --- a/pkg/model/tests/data/bootstrapscript_0.txt +++ b/pkg/model/tests/data/bootstrapscript_0.txt @@ -29,7 +29,10 @@ systemctl daemon-reload systemctl daemon-reexec -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/pkg/model/tests/data/bootstrapscript_1.txt b/pkg/model/tests/data/bootstrapscript_1.txt index 3b532a88d0ba6..070a594920a69 100644 --- a/pkg/model/tests/data/bootstrapscript_1.txt +++ b/pkg/model/tests/data/bootstrapscript_1.txt @@ -29,7 +29,10 @@ systemctl daemon-reload systemctl daemon-reexec -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/pkg/model/tests/data/bootstrapscript_2.txt b/pkg/model/tests/data/bootstrapscript_2.txt index 3b532a88d0ba6..070a594920a69 100644 --- a/pkg/model/tests/data/bootstrapscript_2.txt +++ b/pkg/model/tests/data/bootstrapscript_2.txt @@ -29,7 +29,10 @@ systemctl daemon-reload systemctl daemon-reexec -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/pkg/model/tests/data/bootstrapscript_3.txt b/pkg/model/tests/data/bootstrapscript_3.txt index 7df9d2ad8ca80..f652f79ebb7c0 100644 --- a/pkg/model/tests/data/bootstrapscript_3.txt +++ b/pkg/model/tests/data/bootstrapscript_3.txt @@ -29,7 +29,10 @@ systemctl daemon-reload systemctl daemon-reexec -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/pkg/model/tests/data/bootstrapscript_4.txt b/pkg/model/tests/data/bootstrapscript_4.txt index 5292417ec5b9a..023c791e5265f 100644 --- a/pkg/model/tests/data/bootstrapscript_4.txt +++ b/pkg/model/tests/data/bootstrapscript_4.txt @@ -29,7 +29,10 @@ systemctl daemon-reload systemctl daemon-reexec -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/pkg/model/tests/data/bootstrapscript_5.txt b/pkg/model/tests/data/bootstrapscript_5.txt index 5292417ec5b9a..023c791e5265f 100644 --- a/pkg/model/tests/data/bootstrapscript_5.txt +++ b/pkg/model/tests/data/bootstrapscript_5.txt @@ -29,7 +29,10 @@ systemctl daemon-reload systemctl daemon-reexec -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml index 51cdb58c42cee..7662283bae798 100644 --- a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml @@ -14,7 +14,10 @@ Resources.AWSEC2LaunchTemplateapiserverapiserversminimalexamplecom.Properties.La - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { @@ -257,7 +260,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { @@ -595,7 +601,10 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index ae3524c037557..7853bd293a923 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data index 12a60d6632589..52f8da79a6d43 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data index a238982430134..1abb98794a93a 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data index d81467999a257..6b776da7cd20e 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data @@ -22,7 +22,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml index 2395eebbf7067..f802a230cfb50 100644 --- a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml @@ -23,7 +23,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties. - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { @@ -386,7 +389,10 @@ Resources.AWSEC2LaunchTemplatenodescomplexexamplecom.Properties.LaunchTemplateDa - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data b/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data index 6097581180806..ff1cfce5bf8d3 100644 --- a/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data +++ b/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data @@ -22,7 +22,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data b/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data index 105c49e1c266a..4ee9226bba792 100644 --- a/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data +++ b/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data @@ -22,7 +22,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data b/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data index a89aff90a2ff8..3a534abdbad58 100644 --- a/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data +++ b/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data @@ -22,7 +22,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data b/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data index 4dcc1d0889a1e..e4c6c105b6e18 100644 --- a/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data +++ b/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data @@ -22,7 +22,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml index bcd7ded9854d3..c2aa9d3bb35b5 100644 --- a/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml @@ -14,7 +14,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { @@ -369,7 +372,10 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml index 8ac7ec9e2f459..6ece33866d1c8 100644 --- a/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml @@ -14,7 +14,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { @@ -351,7 +354,10 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml index cdaa33cf4107a..d4ebf069da0a7 100644 --- a/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml @@ -14,7 +14,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersdockerexamplecom.Properties.L - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { @@ -354,7 +357,10 @@ Resources.AWSEC2LaunchTemplatenodesdockerexamplecom.Properties.LaunchTemplateDat - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data index 5c6660e38033b..fe6a8f9068ea2 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data index bb202682c7e5a..393741911a858 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data index d6e87287ac28a..f4718c0860a95 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data index f5ed10bef9db7..48b16b52285b0 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml index 6b0442a0c63fc..c7e3dd1612140 100644 --- a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml @@ -14,7 +14,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { @@ -351,7 +354,10 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data index 1fcf1d0671057..fe3b0fa5651de 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data index d54404c62d61b..957c98d75d1c7 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data index 55616e8b1f837..00b44a9d46245 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data index f0951372d951d..8b6eb1d4aae00 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml index 7fa5317441b1d..4a507abe7f1ec 100644 --- a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml @@ -14,7 +14,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersexternallbexamplecom.Properti - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { @@ -351,7 +354,10 @@ Resources.AWSEC2LaunchTemplatenodesexternallbexamplecom.Properties.LaunchTemplat - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data b/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data index 9f093c4ca1ad1..110ca6783519d 100644 --- a/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data +++ b/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data b/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data index a18a6e8610f99..8fc34dc23efb9 100644 --- a/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data +++ b/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data index 9299348d29f2b..2e519e9a15494 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data +++ b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data index d79ab6ef86545..8d890d576e746 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data +++ b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data index 275c9f47e27e4..7946d95a6f9ee 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data index 40d65ef91d076..e78138d9b2401 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data index 2e4c90959d885..6859b18252df2 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data index f51d67448c8f3..3f0452a02e10f 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script index 1b90f5fb3a5bf..ada83fa7c6505 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script @@ -12,7 +12,10 @@ NODEUP_HASH_ARM64=7603675379699105a9b9915ff97718ea99b1bbb01a4c184e2f827c8a96e8e8 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script index cc47e16f2e87b..89745d563b524 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script @@ -12,7 +12,10 @@ NODEUP_HASH_ARM64=7603675379699105a9b9915ff97718ea99b1bbb01a4c184e2f827c8a96e8e8 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script index 31235472d3b35..73d2d621b1970 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script @@ -12,7 +12,10 @@ NODEUP_HASH_ARM64=7603675379699105a9b9915ff97718ea99b1bbb01a4c184e2f827c8a96e8e8 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script index 536c825eeb3cb..d31aee596cf51 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script @@ -12,7 +12,10 @@ NODEUP_HASH_ARM64=7603675379699105a9b9915ff97718ea99b1bbb01a4c184e2f827c8a96e8e8 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index ab72c8951518c..08ce2e132802b 100644 --- a/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data index 8abf575d564d6..0ca38c2e7b493 100644 --- a/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index d6c0fdffb48fb..2398571b787b6 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data index f643afa75b4cb..6dc621833db02 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml index 0e605e00ba475..df6045018e9ce 100644 --- a/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml @@ -14,7 +14,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimaletcdexamplecom.Propert - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { @@ -367,7 +370,10 @@ Resources.AWSEC2LaunchTemplatenodesminimaletcdexamplecom.Properties.LaunchTempla - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml index 1f37adedb7154..7ae348d2c1725 100644 --- a/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml @@ -14,7 +14,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { @@ -357,7 +360,10 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index dbd319a4dc372..e107dbd9bca08 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data index 12a60d6632589..52f8da79a6d43 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml index 555ffc8717b7b..d73d5c05e2d55 100644 --- a/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml @@ -14,7 +14,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { @@ -351,7 +354,10 @@ Resources.AWSEC2LaunchTemplatenodesminimalipv6examplecom.Properties.LaunchTempla - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 0e23b9c8fea4d..1a4915596cbdd 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 36aaf842eb129..91d60391b6c46 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data b/tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data index 52a47c9b28cf9..958f24bdfd468 100644 --- a/tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data +++ b/tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/minimal-json/data/aws_launch_template_nodes.minimal-json.example.com_user_data b/tests/integration/update_cluster/minimal-json/data/aws_launch_template_nodes.minimal-json.example.com_user_data index f6eb64d75608c..0f9fe9b1083e6 100644 --- a/tests/integration/update_cluster/minimal-json/data/aws_launch_template_nodes.minimal-json.example.com_user_data +++ b/tests/integration/update_cluster/minimal-json/data/aws_launch_template_nodes.minimal-json.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data index 1bcfb30b8f654..a455d8a992b4a 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data index a73acbfc8ae07..308412ee04b49 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml index 6b0442a0c63fc..c7e3dd1612140 100644 --- a/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml @@ -14,7 +14,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { @@ -351,7 +354,10 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 3a020ab959da3..3b98f23fc6ce7 100644 --- a/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data index 12a60d6632589..52f8da79a6d43 100644 --- a/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script index dab713e5dbcab..6124af1d1e564 100644 --- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script @@ -12,7 +12,10 @@ NODEUP_HASH_ARM64=7603675379699105a9b9915ff97718ea99b1bbb01a4c184e2f827c8a96e8e8 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script index 34ab5b22642cc..483b309cb73c0 100644 --- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script @@ -12,7 +12,10 @@ NODEUP_HASH_ARM64=7603675379699105a9b9915ff97718ea99b1bbb01a4c184e2f827c8a96e8e8 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script index 4e74e8d18f513..02e6a20b1022e 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script @@ -12,7 +12,10 @@ NODEUP_HASH_ARM64=7603675379699105a9b9915ff97718ea99b1bbb01a4c184e2f827c8a96e8e8 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script index b7b3310f5d2e2..d5923011ceedf 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script @@ -12,7 +12,10 @@ NODEUP_HASH_ARM64=7603675379699105a9b9915ff97718ea99b1bbb01a4c184e2f827c8a96e8e8 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data index 761d471b77111..c8a904291fde4 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data index f4fc8a0e7064a..f15cc478c3a50 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml index 48332d7df9356..9dcb6ed171fb4 100644 --- a/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml @@ -14,7 +14,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { @@ -351,7 +354,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { @@ -688,7 +694,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { @@ -1025,7 +1034,10 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data index 3cdbb3374bb12..ea60fc1399693 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data index a69c64471e4c7..70e02d2893755 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data index ceb030186ee23..10b14c68c1702 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data index 09d36f40386c7..3e1d246183bb6 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml index 48332d7df9356..9dcb6ed171fb4 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml @@ -14,7 +14,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { @@ -351,7 +354,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { @@ -688,7 +694,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { @@ -1025,7 +1034,10 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data index 3cdbb3374bb12..ea60fc1399693 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data index a69c64471e4c7..70e02d2893755 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data index ceb030186ee23..10b14c68c1702 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data index 09d36f40386c7..3e1d246183bb6 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml index 6b27c5de5a4e3..17030d3ebfac2 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml @@ -14,7 +14,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersnthsqsresourcesexamplecom.Pro - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { @@ -351,7 +354,10 @@ Resources.AWSEC2LaunchTemplatenodesnthsqsresourcesexamplecom.Properties.LaunchTe - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data index e3a2fb00fffcb..2b5088c011523 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_nodes.nthsqsresources.example.com_user_data b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_nodes.nthsqsresources.example.com_user_data index e6cce941a6c1e..addcd23047b88 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_nodes.nthsqsresources.example.com_user_data +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_nodes.nthsqsresources.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml index 4cae4bf28aa95..8f4a54e241609 100644 --- a/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml @@ -15,7 +15,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatesharedipexamplecom.Pro - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { @@ -352,7 +355,10 @@ Resources.AWSEC2LaunchTemplatenodesprivatesharedipexamplecom.Properties.LaunchTe - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data index b6882f6b98b02..baeec7743dda7 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data index 8241e0261380e..8ebb376a8a8db 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data index 5d868ff80340c..4f2acb6e6cef1 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data index a3bf71dcac88d..e9dabd6d42cb4 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml index 0d3c8bf8a0203..d827f233b9886 100644 --- a/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml @@ -15,7 +15,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatecalicoexamplecom.Prope - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { @@ -352,7 +355,10 @@ Resources.AWSEC2LaunchTemplatenodesprivatecalicoexamplecom.Properties.LaunchTemp - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data index c270d2fca7655..ff25b6b4f9936 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data +++ b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data index e9f3a709e17da..b61a702c2bcb5 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data +++ b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data index 7059f50105e0a..78dea64e9a705 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data +++ b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data index ab11743d68fe2..9db7936425688 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data +++ b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml index 74df49907f8a6..a64ba0616c13f 100644 --- a/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml @@ -15,7 +15,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { @@ -352,7 +355,10 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data index c2d0e7df50b3c..fdcbc243e6a37 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data index cfce125ee134c..59bded293d0ac 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml index e7302a05c2da2..e3d330e0fcc42 100644 --- a/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml @@ -15,7 +15,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { @@ -341,7 +344,10 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data index a5d890c594e52..a369c2368f91d 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data index 5c20df3177465..f8fdf7128adfd 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml index c6643f659e006..14253e4405454 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml @@ -15,7 +15,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumadvancedexamplec - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { @@ -356,7 +359,10 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumadvancedexamplecom.Properties.La - sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true + sysctl -w net.core.rmem_max=16777216 || true + sysctl -w net.core.wmem_max=16777216 || true + sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true + sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data index 3fb2115677100..407b6a89954a9 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data index 3341f1e2689ba..3727e1b9932b4 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data index bd89975da9f9e..c72dd8b28e645 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data +++ b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data index a30a96eb0586b..ef66d7b82d014 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data +++ b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data index 2963142b03c54..76c704aea1cf1 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data +++ b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data index 5577d7aac5729..ccd0742d8c246 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data +++ b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data index c728e0bf11cfd..70ba653311e2f 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data +++ b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data index b9f556a13ef5a..1fbc5c5250dba 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data +++ b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data index 690f37a754f04..33b6c4e1eb09a 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data +++ b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data index 14a9440debf76..a0743ad2a913f 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data +++ b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data b/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data index 0349c39aab495..c8678ef047fa3 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data +++ b/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data b/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data index 9bccdce7c846b..346c96f5e7579 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data +++ b/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index e772ffbf0e697..381c3300ce4d2 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data index 098c22532f8f7..10c60c6029538 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data index 4ea809d28b2b5..4b24dcd956049 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data +++ b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data index 8455f9204f68a..9a0c36b7b5880 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data +++ b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data index 0376517854111..d7068ad7f95aa 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data index c9bc02a93b38b..dce74029cd41f 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data index f801afd237187..3a57192a56328 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data +++ b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data index 65f8fff7a0570..ff15fc0192e5c 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data +++ b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index ae3524c037557..7853bd293a923 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() { diff --git a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data index 12a60d6632589..52f8da79a6d43 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -13,7 +13,10 @@ export AWS_REGION=us-test-1 -sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true +sysctl -w net.core.rmem_max=16777216 || true +sysctl -w net.core.wmem_max=16777216 || true +sysctl -w net.ipv4.tcp_rmem='4096 87380 16777216' || true +sysctl -w net.ipv4.tcp_wmem='4096 87380 16777216' || true function ensure-install-dir() {