From 699c3ad299951c745165074a9a219b81a5d50479 Mon Sep 17 00:00:00 2001 From: Christian Bell Date: Tue, 21 Mar 2017 09:15:39 -0700 Subject: [PATCH] [Federation][e2e] Ensure kubefed times out in federation-up.sh Although this should eventually be moved into kubefed itself, monitor kubefed from federation-up.sh and force it to timeout after being unable to initialize. --- federation/cluster/federation-up.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/federation/cluster/federation-up.sh b/federation/cluster/federation-up.sh index af23bbe7914..fc42856a41b 100755 --- a/federation/cluster/federation-up.sh +++ b/federation/cluster/federation-up.sh @@ -82,7 +82,9 @@ function init() { kube::log::status "DNS_ZONE_NAME: \"${DNS_ZONE_NAME}\", DNS_PROVIDER: \"${DNS_PROVIDER}\"" kube::log::status "Image: \"${kube_registry}/hyperkube-amd64:${kube_version}\"" - "${KUBE_ROOT}/federation/develop/kubefed.sh" init \ + # Send INT after 20m and KILL 1m after that if process is still alive. + timeout --signal=INT --kill-after=1m 20m \ + "${KUBE_ROOT}/federation/develop/kubefed.sh" init \ "${FEDERATION_NAME}" \ --host-cluster-context="${HOST_CLUSTER_CONTEXT}" \ --dns-zone-name="${DNS_ZONE_NAME}" \