diff --git a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml index 4318b787eb..62498349e6 100644 --- a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml @@ -48,9 +48,10 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersexternallbexampl while true; do for url in "${urls[@]}"; do local file="${url##*/}" - rm -f "${file}" - if [[ $(which curl) ]]; then + if [[ -e "${file}" ]]; then + echo "== File exists for ${url} ==" + elif [[ $(which curl) ]]; then if ! curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10 "${url}"; then echo "== Failed to curl ${url}. Retrying. ==" break @@ -67,6 +68,7 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersexternallbexampl if [[ -n "${hash}" ]] && ! validate-hash "${file}" "${hash}"; then echo "== Hash validation of ${url} failed. Retrying. ==" + rm -f "${file}" else if [[ -n "${hash}" ]]; then echo "== Downloaded ${url} (SHA1 = ${hash}) ==" @@ -344,9 +346,10 @@ Resources.AWSAutoScalingLaunchConfigurationnodesexternallbexamplecom.Properties. while true; do for url in "${urls[@]}"; do local file="${url##*/}" - rm -f "${file}" - if [[ $(which curl) ]]; then + if [[ -e "${file}" ]]; then + echo "== File exists for ${url} ==" + elif [[ $(which curl) ]]; then if ! curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10 "${url}"; then echo "== Failed to curl ${url}. Retrying. ==" break @@ -363,6 +366,7 @@ Resources.AWSAutoScalingLaunchConfigurationnodesexternallbexamplecom.Properties. if [[ -n "${hash}" ]] && ! validate-hash "${file}" "${hash}"; then echo "== Hash validation of ${url} failed. Retrying. ==" + rm -f "${file}" else if [[ -n "${hash}" ]]; then echo "== Downloaded ${url} (SHA1 = ${hash}) ==" diff --git a/tests/integration/update_cluster/externallb/kubernetes.tf b/tests/integration/update_cluster/externallb/kubernetes.tf index 9daa9f569e..afa157770a 100644 --- a/tests/integration/update_cluster/externallb/kubernetes.tf +++ b/tests/integration/update_cluster/externallb/kubernetes.tf @@ -1,3 +1,19 @@ +locals = { + cluster_name = "externallb.example.com" + master_security_group_ids = ["${aws_security_group.masters-externallb-example-com.id}"] + masters_role_arn = "${aws_iam_role.masters-externallb-example-com.arn}" + masters_role_name = "${aws_iam_role.masters-externallb-example-com.name}" + node_security_group_ids = ["${aws_security_group.nodes-externallb-example-com.id}"] + node_subnet_ids = ["${aws_subnet.us-test-1a-externallb-example-com.id}"] + nodes_role_arn = "${aws_iam_role.nodes-externallb-example-com.arn}" + nodes_role_name = "${aws_iam_role.nodes-externallb-example-com.name}" + region = "us-test-1" + route_table_public_id = "${aws_route_table.externallb-example-com.id}" + subnet_us-test-1a-public_id = "${aws_subnet.us-test-1a-externallb-example-com.id}" + vpc_cidr_block = "${aws_vpc.externallb-example-com.cidr_block}" + vpc_id = "${aws_vpc.externallb-example-com.id}" +} + output "cluster_name" { value = "externallb.example.com" }