diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml index 893f1f1c528cd..d3228b4a5ab42 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml @@ -175,6 +175,15 @@ objects: wait_expiry_ts="$(($(date +%s) + 90))" done + # wait until the image registry changes propogate to the apiserver to avoid + # unnecessary restarts + until oc get is -n openshift php 2>/dev/null; do + sleep 10 + done + until [[ -n "$( oc get is -n openshift php --template '{{ .status.dockerImageRepository }}' 2>/dev/null )" ]]; do + sleep 10 + done + # set up cloud-provider-specific env vars if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then export GOOGLE_APPLICATION_CREDENTIALS="/tmp/cluster/gce.json" diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml index d7de0369823c7..b2bd1911a01e4 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml @@ -173,6 +173,15 @@ objects: wait_expiry_ts="$(($(date +%s) + 90))" done + # wait until the image registry changes propogate to the apiserver to avoid + # unnecessary restarts + until oc get is -n openshift php 2>/dev/null; do + sleep 10 + done + until [[ -n "$( oc get is -n openshift php --template '{{ .status.dockerImageRepository }}' 2>/dev/null )" ]]; do + sleep 10 + done + # set up cloud-provider-specific env vars if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then export GOOGLE_APPLICATION_CREDENTIALS="/tmp/cluster/gce.json"