kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix tests that crossed during PR merges

This commit is contained in:
Justin Santa Barbara 2018-07-19 22:07:02 -04:00
parent 630ea429ae
commit fd70778ccf
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml
View File

@ -48,9 +48,10 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersexternallbexampl
while true; do while true; do
for url in "${urls[@]}"; do for url in "${urls[@]}"; do
local file="${url##*/}" 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 if ! curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10 "${url}"; then
echo "== Failed to curl ${url}. Retrying. ==" echo "== Failed to curl ${url}. Retrying. =="
break break
@ -67,6 +68,7 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersexternallbexampl
if [[ -n "${hash}" ]] && ! validate-hash "${file}" "${hash}"; then if [[ -n "${hash}" ]] && ! validate-hash "${file}" "${hash}"; then
echo "== Hash validation of ${url} failed. Retrying. ==" echo "== Hash validation of ${url} failed. Retrying. =="
rm -f "${file}"
else else
if [[ -n "${hash}" ]]; then if [[ -n "${hash}" ]]; then
echo "== Downloaded ${url} (SHA1 = ${hash}) ==" echo "== Downloaded ${url} (SHA1 = ${hash}) =="
@ -344,9 +346,10 @@ Resources.AWSAutoScalingLaunchConfigurationnodesexternallbexamplecom.Properties.
while true; do while true; do
for url in "${urls[@]}"; do for url in "${urls[@]}"; do
local file="${url##*/}" 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 if ! curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10 "${url}"; then
echo "== Failed to curl ${url}. Retrying. ==" echo "== Failed to curl ${url}. Retrying. =="
break break
@ -363,6 +366,7 @@ Resources.AWSAutoScalingLaunchConfigurationnodesexternallbexamplecom.Properties.
if [[ -n "${hash}" ]] && ! validate-hash "${file}" "${hash}"; then if [[ -n "${hash}" ]] && ! validate-hash "${file}" "${hash}"; then
echo "== Hash validation of ${url} failed. Retrying. ==" echo "== Hash validation of ${url} failed. Retrying. =="
rm -f "${file}"
else else
if [[ -n "${hash}" ]]; then if [[ -n "${hash}" ]]; then
echo "== Downloaded ${url} (SHA1 = ${hash}) ==" echo "== Downloaded ${url} (SHA1 = ${hash}) =="

16
tests/integration/update_cluster/externallb/kubernetes.tf
View File

@ -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" { output "cluster_name" {
value = "externallb.example.com" value = "externallb.example.com"
} }