From 74a44c227012e3cc4461c4177a7f85af6fc19935 Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Sun, 13 Jun 2021 21:46:58 -0700 Subject: [PATCH] Don't restrict nodeup download to IPv4 --- pkg/model/resources/nodeup.go | 8 ++--- pkg/model/tests/data/bootstrapscript_0.txt | 8 ++--- pkg/model/tests/data/bootstrapscript_1.txt | 8 ++--- pkg/model/tests/data/bootstrapscript_2.txt | 8 ++--- pkg/model/tests/data/bootstrapscript_3.txt | 8 ++--- pkg/model/tests/data/bootstrapscript_4.txt | 8 ++--- pkg/model/tests/data/bootstrapscript_5.txt | 8 ++--- .../cloudformation.json.extracted.yaml | 24 +++++++------- ...t-1a.masters.minimal.example.com_user_data | 8 ++--- ...mplate_nodes.minimal.example.com_user_data | 8 ++--- ...ters.bastionuserdata.example.com_user_data | 8 ++--- ...odes.bastionuserdata.example.com_user_data | 8 ++--- .../cloudformation.json.extracted.yaml | 16 +++++----- ...t-1a.masters.complex.example.com_user_data | 8 ++--- ...mplate_nodes.complex.example.com_user_data | 8 ++--- ...-1a.masters.compress.example.com_user_data | 8 ++--- ...plate_nodes.compress.example.com_user_data | 8 ++--- .../cloudformation.json.extracted.yaml | 16 +++++----- .../cloudformation.json.extracted.yaml | 16 +++++----- .../cloudformation.json.extracted.yaml | 16 +++++----- ...masters.existing-iam.example.com_user_data | 8 ++--- ...masters.existing-iam.example.com_user_data | 8 ++--- ...masters.existing-iam.example.com_user_data | 8 ++--- ...e_nodes.existing-iam.example.com_user_data | 8 ++--- .../cloudformation.json.extracted.yaml | 16 +++++----- ...a.masters.existingsg.example.com_user_data | 8 ++--- ...b.masters.existingsg.example.com_user_data | 8 ++--- ...c.masters.existingsg.example.com_user_data | 8 ++--- ...ate_nodes.existingsg.example.com_user_data | 8 ++--- .../cloudformation.json.extracted.yaml | 16 +++++----- ...a.masters.externallb.example.com_user_data | 8 ++--- ...ate_nodes.externallb.example.com_user_data | 8 ++--- ...ers.externalpolicies.example.com_user_data | 8 ++--- ...des.externalpolicies.example.com_user_data | 8 ++--- ...s-test-1a.masters.ha.example.com_user_data | 8 ++--- ...s-test-1b.masters.ha.example.com_user_data | 8 ++--- ...s-test-1c.masters.ha.example.com_user_data | 8 ++--- ...ch_template_nodes.ha.example.com_user_data | 8 ++--- ...ha-gce-example-com_metadata_startup-script | 8 ++--- ...ha-gce-example-com_metadata_startup-script | 8 ++--- ...ha-gce-example-com_metadata_startup-script | 8 ++--- ...ha-gce-example-com_metadata_startup-script | 8 ++--- ...t-1a.masters.minimal.example.com_user_data | 8 ++--- ...mplate_nodes.minimal.example.com_user_data | 8 ++--- .../cloudformation.json.extracted.yaml | 16 +++++----- .../cloudformation.json.extracted.yaml | 16 +++++----- ...t-1a.masters.minimal.example.com_user_data | 8 ++--- ...mplate_nodes.minimal.example.com_user_data | 8 ++--- .../cloudformation.json.extracted.yaml | 16 +++++----- ...masters.minimal-ipv6.example.com_user_data | 8 ++--- ...e_nodes.minimal-ipv6.example.com_user_data | 8 ++--- ...masters.minimal-json.example.com_user_data | 8 ++--- ...e_nodes.minimal-json.example.com_user_data | 8 ++--- .../cloudformation.json.extracted.yaml | 16 +++++----- ...t-1a.masters.minimal.example.com_user_data | 8 ++--- ...mplate_nodes.minimal.example.com_user_data | 8 ++--- ...al-gce-example-com_metadata_startup-script | 8 ++--- ...al-gce-example-com_metadata_startup-script | 8 ++--- ...rivate-example-com_metadata_startup-script | 8 ++--- ...rivate-example-com_metadata_startup-script | 8 ++--- ...est-1a.masters.minimal.k8s.local_user_data | 8 ++--- ...template_nodes.minimal.k8s.local_user_data | 8 ++--- .../cloudformation.json.extracted.yaml | 32 +++++++++---------- ...sters.mixedinstances.example.com_user_data | 8 ++--- ...sters.mixedinstances.example.com_user_data | 8 ++--- ...sters.mixedinstances.example.com_user_data | 8 ++--- ...nodes.mixedinstances.example.com_user_data | 8 ++--- .../cloudformation.json.extracted.yaml | 32 +++++++++---------- ...sters.mixedinstances.example.com_user_data | 8 ++--- ...sters.mixedinstances.example.com_user_data | 8 ++--- ...sters.mixedinstances.example.com_user_data | 8 ++--- ...nodes.mixedinstances.example.com_user_data | 8 ++--- .../cloudformation.json.extracted.yaml | 16 +++++----- ...ters.nthsqsresources.example.com_user_data | 8 ++--- ...odes.nthsqsresources.example.com_user_data | 8 ++--- .../cloudformation.json.extracted.yaml | 16 +++++----- ...rs.private-shared-ip.example.com_user_data | 8 ++--- ...es.private-shared-ip.example.com_user_data | 8 ++--- ...rivate-shared-subnet.example.com_user_data | 8 ++--- ...rivate-shared-subnet.example.com_user_data | 8 ++--- .../cloudformation.json.extracted.yaml | 16 +++++----- ...asters.privatecalico.example.com_user_data | 8 ++--- ..._nodes.privatecalico.example.com_user_data | 8 ++--- ...masters.privatecanal.example.com_user_data | 8 ++--- ...e_nodes.privatecanal.example.com_user_data | 8 ++--- .../cloudformation.json.extracted.yaml | 16 +++++----- ...asters.privatecilium.example.com_user_data | 8 ++--- ..._nodes.privatecilium.example.com_user_data | 8 ++--- .../cloudformation.json.extracted.yaml | 16 +++++----- ...asters.privatecilium.example.com_user_data | 8 ++--- ..._nodes.privatecilium.example.com_user_data | 8 ++--- .../cloudformation.json.extracted.yaml | 16 +++++----- ...rivateciliumadvanced.example.com_user_data | 8 ++--- ...rivateciliumadvanced.example.com_user_data | 8 ++--- ....masters.privatedns1.example.com_user_data | 8 ++--- ...te_nodes.privatedns1.example.com_user_data | 8 ++--- ....masters.privatedns2.example.com_user_data | 8 ++--- ...te_nodes.privatedns2.example.com_user_data | 8 ++--- ...sters.privateflannel.example.com_user_data | 8 ++--- ...nodes.privateflannel.example.com_user_data | 8 ++--- ...asters.privatekopeio.example.com_user_data | 8 ++--- ..._nodes.privatekopeio.example.com_user_data | 8 ++--- ...masters.privateweave.example.com_user_data | 8 ++--- ...e_nodes.privateweave.example.com_user_data | 8 ++--- ...t-1a.masters.minimal.example.com_user_data | 8 ++--- ...mplate_nodes.minimal.example.com_user_data | 8 ++--- ...masters.sharedsubnet.example.com_user_data | 8 ++--- ...e_nodes.sharedsubnet.example.com_user_data | 8 ++--- ...1a.masters.sharedvpc.example.com_user_data | 8 ++--- ...late_nodes.sharedvpc.example.com_user_data | 8 ++--- ...1a.masters.unmanaged.example.com_user_data | 8 ++--- ...late_nodes.unmanaged.example.com_user_data | 8 ++--- ...t-1a.masters.minimal.example.com_user_data | 8 ++--- ...mplate_nodes.minimal.example.com_user_data | 8 ++--- 114 files changed, 552 insertions(+), 552 deletions(-) diff --git a/pkg/model/resources/nodeup.go b/pkg/model/resources/nodeup.go index af8b8d2833..0a14a38b42 100644 --- a/pkg/model/resources/nodeup.go +++ b/pkg/model/resources/nodeup.go @@ -70,10 +70,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" diff --git a/pkg/model/tests/data/bootstrapscript_0.txt b/pkg/model/tests/data/bootstrapscript_0.txt index eb9633c87d..15058fe7ee 100644 --- a/pkg/model/tests/data/bootstrapscript_0.txt +++ b/pkg/model/tests/data/bootstrapscript_0.txt @@ -60,10 +60,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" diff --git a/pkg/model/tests/data/bootstrapscript_1.txt b/pkg/model/tests/data/bootstrapscript_1.txt index 028611db8f..6d55c97961 100644 --- a/pkg/model/tests/data/bootstrapscript_1.txt +++ b/pkg/model/tests/data/bootstrapscript_1.txt @@ -60,10 +60,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" diff --git a/pkg/model/tests/data/bootstrapscript_2.txt b/pkg/model/tests/data/bootstrapscript_2.txt index 028611db8f..6d55c97961 100644 --- a/pkg/model/tests/data/bootstrapscript_2.txt +++ b/pkg/model/tests/data/bootstrapscript_2.txt @@ -60,10 +60,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" diff --git a/pkg/model/tests/data/bootstrapscript_3.txt b/pkg/model/tests/data/bootstrapscript_3.txt index 59df46cc8e..8fb5a88735 100644 --- a/pkg/model/tests/data/bootstrapscript_3.txt +++ b/pkg/model/tests/data/bootstrapscript_3.txt @@ -60,10 +60,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" diff --git a/pkg/model/tests/data/bootstrapscript_4.txt b/pkg/model/tests/data/bootstrapscript_4.txt index ed600e6396..60023ed624 100644 --- a/pkg/model/tests/data/bootstrapscript_4.txt +++ b/pkg/model/tests/data/bootstrapscript_4.txt @@ -60,10 +60,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" diff --git a/pkg/model/tests/data/bootstrapscript_5.txt b/pkg/model/tests/data/bootstrapscript_5.txt index ed600e6396..60023ed624 100644 --- a/pkg/model/tests/data/bootstrapscript_5.txt +++ b/pkg/model/tests/data/bootstrapscript_5.txt @@ -60,10 +60,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" diff --git a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml index 9a9eea077b..c388a74b69 100644 --- a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml @@ -45,10 +45,10 @@ Resources.AWSEC2LaunchTemplateapiserverapiserversminimalexamplecom.Properties.La while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" @@ -264,10 +264,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" @@ -577,10 +577,10 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 126f7c31a4..5c4a01ce99 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 e36161344e..6d831afe58 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 956e382c9b..f32b81c1e3 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 19f2079a74..d7949fd19e 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 @@ -53,10 +53,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" diff --git a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml index 43c5f23cd3..ea29558c2b 100644 --- a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml @@ -54,10 +54,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties. while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" @@ -392,10 +392,10 @@ Resources.AWSEC2LaunchTemplatenodescomplexexamplecom.Properties.LaunchTemplateDa while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 5ba2183542..7e8aee3704 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 @@ -53,10 +53,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 ddd0bda774..94469eb290 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 @@ -53,10 +53,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 066e367c15..dcb0860fa8 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 @@ -53,10 +53,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 9823da440f..99deaaa46c 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 @@ -53,10 +53,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 e0e85cfc00..f92a2e394c 100644 --- a/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml @@ -45,10 +45,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" @@ -375,10 +375,10 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" diff --git a/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml index 944afed18f..46d3b429b2 100644 --- a/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml @@ -45,10 +45,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" @@ -357,10 +357,10 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 a877c272a4..17d0757404 100644 --- a/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml @@ -45,10 +45,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersdockerexamplecom.Properties.L while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" @@ -360,10 +360,10 @@ Resources.AWSEC2LaunchTemplatenodesdockerexamplecom.Properties.LaunchTemplateDat while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 31f5084460..3e579ff388 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 a67cb14ff1..1294d72007 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 0301191537..8218765c7b 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 65707decad..f91cc2f6b8 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 6434c6cb42..d9a2235368 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 @@ -45,10 +45,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" @@ -357,10 +357,10 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 cf8286fb6b..5ffba37a2a 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 a1611e8ab7..e335f07565 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 dbfed7c5f8..2c9ed84aeb 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 5df2d05fb7..7e538d7350 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" diff --git a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml index bd982e7486..edf94b4c96 100644 --- a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml @@ -45,10 +45,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersexternallbexamplecom.Properti while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" @@ -357,10 +357,10 @@ Resources.AWSEC2LaunchTemplatenodesexternallbexamplecom.Properties.LaunchTemplat while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 991f014102..1ac64f7b09 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 de8d59787e..a2b22dedc2 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 f222f835de..894b53fc04 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 2139c24ac1..d3e870f79c 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 054d09f4cb..7978569422 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 77d63e8a05..67888797b1 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 12ad25c6e8..d10ef07706 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 4cd706c5e9..4cd362620a 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 32a6472b08..d86febcabc 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 @@ -43,10 +43,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 d0c1194b59..a4c8c96b44 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 @@ -43,10 +43,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 63df2400a7..70bfc7b799 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 @@ -43,10 +43,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 bf4ec5d948..348d6a5951 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 @@ -43,10 +43,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 7535e62868..2e0df2bff3 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 31839ca9b7..1734db6e36 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 e558702198..b2b80401d7 100644 --- a/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml @@ -45,10 +45,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimaletcdexamplecom.Propert while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" @@ -373,10 +373,10 @@ Resources.AWSEC2LaunchTemplatenodesminimaletcdexamplecom.Properties.LaunchTempla while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 9e1f9a99f1..66983d581d 100644 --- a/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml @@ -45,10 +45,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" @@ -363,10 +363,10 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 b066519176..710d2e744f 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 e36161344e..6d831afe58 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 0dc6235989..b5a91b163d 100644 --- a/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml @@ -45,10 +45,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" @@ -357,10 +357,10 @@ Resources.AWSEC2LaunchTemplatenodesminimalipv6examplecom.Properties.LaunchTempla while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 672e0a2e6a..fb18a420e0 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 866a4c5f8b..7180d3e799 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 29eeeccd5b..2a64a6c354 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 a9774a85ca..b44b8240a2 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" diff --git a/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml index 6434c6cb42..d9a2235368 100644 --- a/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml @@ -45,10 +45,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" @@ -357,10 +357,10 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 f6c00719bc..2ecf51b0b9 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 e36161344e..6d831afe58 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 342a046b7b..feddc9fbb8 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 @@ -43,10 +43,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 8978178be3..d56bb807a8 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 @@ -43,10 +43,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 1bad4ab04c..f0bbb5f524 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 @@ -43,10 +43,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 0f1e062c27..91a0bd774b 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 @@ -43,10 +43,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 be5c809eef..d16731e343 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 00354cff90..5a08d3c6ce 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 ff6a551b40..ea2b757295 100644 --- a/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml @@ -45,10 +45,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" @@ -357,10 +357,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" @@ -669,10 +669,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" @@ -981,10 +981,10 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 947b717907..c9fa77452a 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 1bf7a497bb..e394effd46 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 23eb56b6f7..4676f562cd 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 e9ee58a4c0..999ecd51b0 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 ff6a551b40..ea2b757295 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 @@ -45,10 +45,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" @@ -357,10 +357,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" @@ -669,10 +669,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" @@ -981,10 +981,10 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 947b717907..c9fa77452a 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 1bf7a497bb..e394effd46 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 23eb56b6f7..4676f562cd 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 e9ee58a4c0..999ecd51b0 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 bd60280ea5..2ff12704c4 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 @@ -45,10 +45,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersnthsqsresourcesexamplecom.Pro while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" @@ -357,10 +357,10 @@ Resources.AWSEC2LaunchTemplatenodesnthsqsresourcesexamplecom.Properties.LaunchTe while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 80204613f7..e88d676fa8 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 8c870123e3..08557cc0da 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 eaf12852a0..51cb073ff5 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 @@ -46,10 +46,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatesharedipexamplecom.Pro while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" @@ -358,10 +358,10 @@ Resources.AWSEC2LaunchTemplatenodesprivatesharedipexamplecom.Properties.LaunchTe while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 6b74b49b73..47bdfd1c21 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 4eb141c7e4..6ef18231ef 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 b10a96ae13..89c7902d3a 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 1a5c0545f8..fc4eef01f4 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" diff --git a/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml index 1e446f7759..e7baee5ca5 100644 --- a/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml @@ -46,10 +46,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatecalicoexamplecom.Prope while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" @@ -358,10 +358,10 @@ Resources.AWSEC2LaunchTemplatenodesprivatecalicoexamplecom.Properties.LaunchTemp while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 9f56b99c0f..f102047c1e 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 dfe6c6585d..4982b21901 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 1ff05f3a3e..df422bb08d 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 7236cfcef0..4d5bb35fc3 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" diff --git a/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml index 6c9124ada2..9cd301df48 100644 --- a/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml @@ -46,10 +46,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" @@ -358,10 +358,10 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 d2f09f7393..c446059a45 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 f415ed51fe..373f61e2c4 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" diff --git a/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml index 57e84d59e1..116408f109 100644 --- a/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml @@ -46,10 +46,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" @@ -347,10 +347,10 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 452ba0ad7b..a47d2bfd43 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 94440b8737..a2ba04bb2d 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" diff --git a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml index d24cf72366..bc7970dc15 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml @@ -46,10 +46,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumadvancedexamplec while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" @@ -362,10 +362,10 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumadvancedexamplecom.Properties.La while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 a2764cf1ea..85a594ad06 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 b0c311b1c5..1fd32df4e1 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 5e941b82f1..259a77a231 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 62f457f7de..373ae8bb0d 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 bb9f57e7a1..1796d986be 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 0bc19dfeb7..b726589351 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 0879f1a345..3e05f766df 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 0b77a1b34f..8fa0d6a77d 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 74868f37ff..060e94d0ad 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 b88b6205dc..0fc1f4a599 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 104121b802..ce7a0d0695 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 0dcaf800ad..ad9878279e 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 1b0caf89d8..8d92ac3da1 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 910b673e9f..155a9fe3cb 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 9658d7bbc1..a09f2b9b0a 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 8188ae5995..53e3b4dd75 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 83ce2fae52..7e49334149 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 50ea2e089c..1de8181799 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 10681e7d1e..04649faa4d 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 83b0912678..480ce4ae7c 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 126f7c31a4..5c4a01ce99 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}" 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 e36161344e..6d831afe58 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 @@ -44,10 +44,10 @@ download-or-bust() { while true; do for url in "${urls[@]}"; do commands=( - "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" - "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" - "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" + "curl -f -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" + "wget -O "${file}" --connect-timeout=20 --tries=6 --wait=10" ) for cmd in "${commands[@]}"; do echo "Attempting download with: ${cmd} {url}"