feat(scripts): add shell lib with some common helper funcs

Author: njhale

scripts/install_local.sh

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-# Note: run from root dir
+OLM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
+source "${OLM_ROOT}/scripts/lib/olm_util.sh"
 
 set -e
 
@@ -25,24 +26,7 @@ do
     fi
 done
 
-# wait for deployments to be ready
-kubectl rollout status -w deployment/olm-operator --namespace="${namespace}"
-kubectl rollout status -w deployment/catalog-operator --namespace="${namespace}"
-
-retries=50
-until [[ $retries == 0 || $new_csv_phase == "Succeeded" ]]; do
-    new_csv_phase=$(kubectl get csv -n "${namespace}" packageserver -o jsonpath='{.status.phase}' 2>/dev/null || echo "Waiting for CSV to appear")
-    if [[ $new_csv_phase != "$csv_phase" ]]; then
-        csv_phase=$new_csv_phase
-        echo "Package server phase: $csv_phase"
-    fi
-    sleep 1
-    retries=$((retries - 1))
-done
-
-if [ $retries == 0 ]; then
-    echo "CSV \"packageserver\" failed to reach phase succeeded"
+if ! olm::util::await_olm_ready "${namespace}" ; then
+    echo "olm failed to become ready"
     exit 1
 fi
-
-kubectl rollout status -w deployment/packageserver --namespace="${namespace}"

scripts/lib/olm_util.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+olm::util::await_csv_success() {
+    local namespace="$1"
+    local csv="$2"
+    local retries="${3:-50}"
+    local phase
+
+    echo "awaiting ${namespace}/${csv} csv installation success"
+    until [[ "${retries}" -le "0" || "${phase:=$(kubectl get csv -n "${namespace}" "${csv}" -o jsonpath='{.status.phase}' 2>/dev/null || echo "missing")}" == "Succeeded" ]]; do
+        retries=$((retries - 1))
+        echo "current phase: ${phase}, remaining attempts: ${retries}"
+        unset phase
+        sleep 1
+    done
+
+    if [ "${retries}" -le "0" ] ; then
+        echo "${csv} csv installation unsuccessful"
+        return 1
+    fi
+
+    echo "${csv} csv installation succeeded"
+}
+
+olm::util::await_olm_ready() {
+    local namespace="$1"
+
+    kubectl rollout status -w deployment/olm-operator --namespace="${namespace}" || return
+    kubectl rollout status -w deployment/catalog-operator --namespace="${namespace}" || return
+    olm::util::await_csv_success "${namespace}" "packageserver" 32 || return
+}