Attempt to upgrade bundle if install fails before exiting

Also avoid filling up the logs with other installed operators, e.g. grafana. Signed-off-by: Jim Crossley <[email protected]>
trustification · Oct 9, 2024 · 5d56369 · 5d56369
1 parent 1c2f893
commit 5d56369
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/hack/install-trustify.sh b/hack/install-trustify.sh
@@ -23,7 +23,7 @@ fi
 run_bundle() {
   kubectl auth can-i create namespace --all-namespaces
   kubectl create namespace ${NAMESPACE} || true
-  operator-sdk run bundle "${OPERATOR_BUNDLE_IMAGE}" --namespace "${NAMESPACE}" --timeout "${TIMEOUT}" || (kubectl get Subscription --namespace "${NAMESPACE}" -o yaml && exit 1)
+  operator-sdk run bundle "${OPERATOR_BUNDLE_IMAGE}" --namespace "${NAMESPACE}" --timeout "${TIMEOUT}" || operator-sdk run bundle-upgrade "${OPERATOR_BUNDLE_IMAGE}" --namespace "${NAMESPACE}" --timeout "${TIMEOUT}" || (kubectl get Subscription --namespace "${NAMESPACE}" -o yaml && exit 1)
 
   # If on MacOS, need to install `brew install coreutils` to get `timeout`
   timeout 600s bash -c 'until kubectl get customresourcedefinitions.apiextensions.k8s.io trustifies.org.trustify; do sleep 30; done' \
@@ -80,8 +80,6 @@ EOF
     --field-selector=status.phase!=Running  \
     -o yaml \
     pods # Print not running trustify pods when timed out
-
-  kubectl get deployments.apps -n "${NAMESPACE}" -o yaml
 }
 
 # Available versions of OLM here https://github.com/operator-framework/operator-lifecycle-manager/releases