From a6b36c3290f090dbde2b11b7c28b31a5509d5a14 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Mon, 20 Aug 2018 14:53:13 -0400 Subject: [PATCH] Check for router in all possible namespaces until we converge openshift-installer is still creating into tectonic-ingress, but changes will land soon that move it. Make the check work for all three possible router namespaces. --- .../templates/cluster-launch-installer-e2e.yaml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ci-operator/templates/cluster-launch-installer-e2e.yaml b/ci-operator/templates/cluster-launch-installer-e2e.yaml index 9247daa64dd9a..c4d12500af807 100644 --- a/ci-operator/templates/cluster-launch-installer-e2e.yaml +++ b/ci-operator/templates/cluster-launch-installer-e2e.yaml @@ -225,14 +225,21 @@ objects: sleep 15 & wait continue fi - if ! /tmp/oc get deploy/router -n tectonic-ingress 2>/dev/null; then + # check multiple namespaces while we are transitioning to the new locations + if /tmp/oc get deploy/router -n tectonic-ingress 2>/dev/null; then + router_namespace=tectonic-ingress + elif /tmp/oc get deploy/router -n openshift-ingress 2>/dev/null; then + router_namespace=openshift-ingress + elif /tmp/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 break done - if ! /tmp/oc wait deploy/router -n tectonic-ingress --for condition=available --timeout=5m; then + if ! /tmp/oc wait deploy/router -n "${router_namespace}" --for condition=available --timeout=5m; then echo "Installation failed" cp $KUBECONFIG /tmp/admin.kubeconfig exit 1