Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 1 addition & 26 deletions ci-operator/templates/cluster-launch-installer-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,6 @@ objects:

# wait for the router namespace
FOUND_KUBECONFIG=
API_UP=
ROUTER_NAMESPACE=
while true; do
if [[ -f /tmp/shared/exit ]]; then
echo "Another process exited" 2>&1
Expand All @@ -122,34 +120,11 @@ objects:
echo "Waiting for API at $(oc whoami --show-server) to respond ..."
sleep 15 & wait
continue
elif [[ -z "${API_UP}" ]]; then
echo "API at $(oc whoami --show-server) has responded"
API_UP=1
fi
if [[ -z "${ROUTER_NAMESPACE}" ]]; then
# check multiple namespaces while we are transitioning to the new locations
if oc get deploy/router -n tectonic-ingress 2>/dev/null; then
ROUTER_NAMESPACE=tectonic-ingress
elif oc get deploy/router -n openshift-ingress 2>/dev/null; then
ROUTER_NAMESPACE=openshift-ingress
elif oc get deploy/router -n default 2>/dev/null; then
ROUTER_NAMESPACE=default
else
echo "Waiting for router to be created ..."
sleep 15 & wait
continue
fi
echo "Found router in ${ROUTER_NAMESPACE}"
fi
echo "API at $(oc whoami --show-server) has responded"
break
done

if ! oc wait deploy/router -n "${ROUTER_NAMESPACE}" --for condition=available --timeout=20m; then
echo "Installation failed"
cp $KUBECONFIG /tmp/admin.kubeconfig
exit 1
fi

# set up cloud-provider-specific env vars
if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then
export GOOGLE_APPLICATION_CREDENTIALS="/tmp/cluster/gce.json"
Expand Down