🌱 wait for all of olm (#365)

Signed-off-by: David Zager <dzager@redhat.com>
konveyor · Jul 23, 2024 · 17fcf94 · 17fcf94
1 parent 9429a85
commit 17fcf94
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/hack/install-konveyor.sh b/hack/install-konveyor.sh
@@ -92,6 +92,9 @@ EOF
 }
 
 kubectl get customresourcedefinitions.apiextensions.k8s.io clusterserviceversions.operators.coreos.com || operator-sdk olm install
-kubectl wait --timeout=600s --for=condition=established customresourcedefinitions.apiextensions.k8s.io clusterserviceversions.operators.coreos.com
+olm_namespace=$(kubectl get clusterserviceversions.operators.coreos.com --all-namespaces | grep packageserver | awk '{print $1}')
+kubectl rollout status -w deployment/olm-operator --namespace="${olm_namespace}"
+kubectl rollout status -w deployment/catalog-operator --namespace="${olm_namespace}"
+kubectl wait --namespace "${olm_namespace}" --for='jsonpath={.status.phase}'=Succeeded clusterserviceversions.operators.coreos.com packageserver
 kubectl get customresourcedefinitions.apiextensions.k8s.io tackles.tackle.konveyor.io || run_bundle
 install_tackle
diff --git a/hack/install-tackle.sh b/hack/install-tackle.sh
@@ -56,7 +56,10 @@ install_operator() {
 }
 
 kubectl get customresourcedefinitions.apiextensions.k8s.io clusterserviceversions.operators.coreos.com || operator-sdk olm install
-kubectl wait --timeout=600s --for=condition=established customresourcedefinitions.apiextensions.k8s.io clusterserviceversions.operators.coreos.com
+olm_namespace=$(kubectl get clusterserviceversions.operators.coreos.com --all-namespaces | grep packageserver | awk '{print $1}')
+kubectl rollout status -w deployment/olm-operator --namespace="${olm_namespace}"
+kubectl rollout status -w deployment/catalog-operator --namespace="${olm_namespace}"
+kubectl wait --namespace "${olm_namespace}" --for='jsonpath={.status.phase}'=Succeeded clusterserviceversions.operators.coreos.com packageserver
 kubectl get customresourcedefinitions.apiextensions.k8s.io tackles.tackle.konveyor.io || install_operator