Merge pull request #10657 from hakman/automated-cherry-pick-of-#10654…

…-upstream-release-1.19 Automated cherry pick of #10654: Set the tcp_rmem sysctl in bootstrap script
kubernetes · Jan 26, 2021 · b046b37 · b046b37
2 parents 6ad8bad + 7776002
commit b046b37
Show file tree

Hide file tree

Showing 103 changed files with 366 additions and 4 deletions.
diff --git a/pkg/model/bootstrapscript.go b/pkg/model/bootstrapscript.go
@@ -367,6 +367,12 @@ func (b *BootstrapScript) Run(c *fi.Context) error {
 		"GzipBase64": func(data string) (string, error) {
 			return gzipBase64(data)
 		},
+
+		"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"
+		},
 	}
 
 	awsNodeUpTemplate, err := resources.AWSNodeUpTemplate(b.ig)

diff --git a/pkg/model/resources/nodeup.go b/pkg/model/resources/nodeup.go
@@ -40,6 +40,8 @@ NODEUP_HASH_ARM64={{ NodeUpSourceHashArm64 }}
 
 {{ ProxyEnv }}
 
+{{ SetSysctls }}
+
 function ensure-install-dir() {
   INSTALL_DIR="/opt/kops"
   # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/pkg/model/tests/data/bootstrapscript_0.txt b/pkg/model/tests/data/bootstrapscript_0.txt
@@ -29,6 +29,9 @@ systemctl daemon-reload
 systemctl daemon-reexec
 
 
+sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
 function ensure-install-dir() {
   INSTALL_DIR="/opt/kops"
   # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/pkg/model/tests/data/bootstrapscript_1.txt b/pkg/model/tests/data/bootstrapscript_1.txt
@@ -29,6 +29,9 @@ systemctl daemon-reload
 systemctl daemon-reexec
 
 
+sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
 function ensure-install-dir() {
   INSTALL_DIR="/opt/kops"
   # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/pkg/model/tests/data/bootstrapscript_2.txt b/pkg/model/tests/data/bootstrapscript_2.txt
@@ -29,6 +29,9 @@ systemctl daemon-reload
 systemctl daemon-reexec
 
 
+sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
 function ensure-install-dir() {
   INSTALL_DIR="/opt/kops"
   # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/pkg/model/tests/data/bootstrapscript_3.txt b/pkg/model/tests/data/bootstrapscript_3.txt
@@ -29,6 +29,9 @@ systemctl daemon-reload
 systemctl daemon-reexec
 
 
+sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
 function ensure-install-dir() {
   INSTALL_DIR="/opt/kops"
   # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/pkg/model/tests/data/bootstrapscript_4.txt b/pkg/model/tests/data/bootstrapscript_4.txt
@@ -29,6 +29,9 @@ systemctl daemon-reload
 systemctl daemon-reexec
 
 
+sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
 function ensure-install-dir() {
   INSTALL_DIR="/opt/kops"
   # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/pkg/model/tests/data/bootstrapscript_5.txt b/pkg/model/tests/data/bootstrapscript_5.txt
@@ -29,6 +29,9 @@ systemctl daemon-reload
 systemctl daemon-reexec
 
 
+sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
 function ensure-install-dir() {
   INSTALL_DIR="/opt/kops"
   # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/.../data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data b/.../data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data
@@ -13,6 +13,9 @@ export AWS_REGION=us-test-1
 
 
 
+sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
 function ensure-install-dir() {
   INSTALL_DIR="/opt/kops"
   # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/...additional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data b/...additional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data
@@ -22,6 +22,9 @@ export AWS_REGION=us-test-1
 
 
 
+sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
 function ensure-install-dir() {
   INSTALL_DIR="/opt/kops"
   # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml
@@ -23,6 +23,9 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties.
 
 
 
+  sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
   function ensure-install-dir() {
     INSTALL_DIR="/opt/kops"
     # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec
@@ -377,6 +380,9 @@ Resources.AWSEC2LaunchTemplatenodescomplexexamplecom.Properties.LaunchTemplateDa
 
 
 
+  sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
   function ensure-install-dir() {
     INSTALL_DIR="/opt/kops"
     # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/.../complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data b/.../complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data
@@ -22,6 +22,9 @@ export AWS_REGION=us-test-1
 
 
 
+sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
 function ensure-install-dir() {
   INSTALL_DIR="/opt/kops"
   # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/...ation/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data b/...ation/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data
@@ -22,6 +22,9 @@ export AWS_REGION=us-test-1
 
 
 
+sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
 function ensure-install-dir() {
   INSTALL_DIR="/opt/kops"
   # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/...ompress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data b/...ompress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data
@@ -22,6 +22,9 @@ export AWS_REGION=us-test-1
 
 
 
+sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
 function ensure-install-dir() {
   INSTALL_DIR="/opt/kops"
   # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/...ion/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data b/...ion/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data
@@ -22,6 +22,9 @@ export AWS_REGION=us-test-1
 
 
 
+sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
 function ensure-install-dir() {
   INSTALL_DIR="/opt/kops"
   # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml
@@ -14,6 +14,9 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti
 
 
 
+  sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
   function ensure-install-dir() {
     INSTALL_DIR="/opt/kops"
     # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec
@@ -348,6 +351,9 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat
 
 
 
+  sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
   function ensure-install-dir() {
     INSTALL_DIR="/opt/kops"
     # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml
@@ -14,6 +14,9 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti
 
 
 
+  sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
   function ensure-install-dir() {
     INSTALL_DIR="/opt/kops"
     # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec
@@ -326,6 +329,9 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat
 
 
 
+  sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
   function ensure-install-dir() {
     INSTALL_DIR="/opt/kops"
     # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml
@@ -14,6 +14,9 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersdockerexamplecom.Properties.L
 
 
 
+  sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
   function ensure-install-dir() {
     INSTALL_DIR="/opt/kops"
     # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec
@@ -344,6 +347,9 @@ Resources.AWSEC2LaunchTemplatenodesdockerexamplecom.Properties.LaunchTemplateDat
 
 
 
+  sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
   function ensure-install-dir() {
     INSTALL_DIR="/opt/kops"
     # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/...iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data b/...iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data
@@ -13,6 +13,9 @@ export AWS_REGION=us-test-1
 
 
 
+sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
 function ensure-install-dir() {
   INSTALL_DIR="/opt/kops"
   # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/...iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data b/...iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data
@@ -13,6 +13,9 @@ export AWS_REGION=us-test-1
 
 
 
+sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
 function ensure-install-dir() {
   INSTALL_DIR="/opt/kops"
   # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/...iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data b/...iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data
@@ -13,6 +13,9 @@ export AWS_REGION=us-test-1
 
 
 
+sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
 function ensure-install-dir() {
   INSTALL_DIR="/opt/kops"
   # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/...te_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data b/...te_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data
@@ -13,6 +13,9 @@ export AWS_REGION=us-test-1
 
 
 
+sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
 function ensure-install-dir() {
   INSTALL_DIR="/opt/kops"
   # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/...integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml b/...integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml
@@ -14,6 +14,9 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties.
 
 
 
+  sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
   function ensure-install-dir() {
     INSTALL_DIR="/opt/kops"
     # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec
@@ -342,6 +345,9 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa
 
 
 
+  sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
   function ensure-install-dir() {
     INSTALL_DIR="/opt/kops"
     # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/...ng_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data b/...ng_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data
@@ -13,6 +13,9 @@ export AWS_REGION=us-test-1
 
 
 
+sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
 function ensure-install-dir() {
   INSTALL_DIR="/opt/kops"
   # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/...ng_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data b/...ng_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data
@@ -13,6 +13,9 @@ export AWS_REGION=us-test-1
 
 
 
+sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
 function ensure-install-dir() {
   INSTALL_DIR="/opt/kops"
   # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/...ng_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data b/...ng_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data
@@ -13,6 +13,9 @@ export AWS_REGION=us-test-1
 
 
 
+sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
 function ensure-install-dir() {
   INSTALL_DIR="/opt/kops"
   # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/...pdate_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data b/...pdate_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data
@@ -13,6 +13,9 @@ export AWS_REGION=us-test-1
 
 
 
+sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
 function ensure-install-dir() {
   INSTALL_DIR="/opt/kops"
   # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml
@@ -14,6 +14,9 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersexternallbexamplecom.Properti
 
 
 
+  sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
   function ensure-install-dir() {
     INSTALL_DIR="/opt/kops"
     # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec
@@ -342,6 +345,9 @@ Resources.AWSEC2LaunchTemplatenodesexternallbexamplecom.Properties.LaunchTemplat
 
 
 
+  sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
   function ensure-install-dir() {
     INSTALL_DIR="/opt/kops"
     # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/...nallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data b/...nallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data
@@ -13,6 +13,9 @@ export AWS_REGION=us-test-1
 
 
 
+sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
 function ensure-install-dir() {
   INSTALL_DIR="/opt/kops"
   # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/...update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data b/...update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data
@@ -13,6 +13,9 @@ export AWS_REGION=us-test-1
 
 
 
+sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
 function ensure-install-dir() {
   INSTALL_DIR="/opt/kops"
   # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/...data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data b/...data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data
@@ -13,6 +13,9 @@ export AWS_REGION=us-test-1
 
 
 
+sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
 function ensure-install-dir() {
   INSTALL_DIR="/opt/kops"
   # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/...er/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data b/...er/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data
@@ -13,6 +13,9 @@ export AWS_REGION=us-test-1
 
 
 
+sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
 function ensure-install-dir() {
   INSTALL_DIR="/opt/kops"
   # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec

diff --git a/...te_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data b/...te_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data
@@ -13,6 +13,9 @@ export AWS_REGION=us-test-1
 
 
 
+sysctl -w net.ipv4.tcp_rmem='4096 12582912 16777216' || true
+
+
 function ensure-install-dir() {
   INSTALL_DIR="/opt/kops"
   # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec