wait for CSV by name instead of label selector

Signed-off-by: Matthias Wessendorf <[email protected]>

Author: matzew

hack/acm/install-mce.sh

@@ -39,19 +39,27 @@ spec:
   sourceNamespace: openshift-marketplace
 EOF
 
-# Wait for CSV to appear
+# Wait for CSV to appear and get its name
 echo "Waiting for MCE operator CSV to be ready..."
+CSV_NAME=""
 for i in {1..60}; do
-    if oc get csv -n multicluster-engine -o name 2>/dev/null | grep -q multicluster-engine; then
-        echo "MCE CSV found, waiting for Succeeded phase..."
+    CSV_NAME=$(oc get csv -n multicluster-engine -o name 2>/dev/null | grep multicluster-engine || true)
+    if [ -n "$CSV_NAME" ]; then
+        echo "MCE CSV found: $CSV_NAME"
         break
     fi
     echo "  Waiting for MCE CSV to appear ($i/60)..."
     sleep 5
 done
 
+if [ -z "$CSV_NAME" ]; then
+    echo "Error: MCE CSV not found after waiting"
+    exit 1
+fi
+
 # Wait for CSV to be ready
-oc wait --for=jsonpath='{.status.phase}'=Succeeded csv -l operators.coreos.com/multicluster-engine.multicluster-engine -n multicluster-engine --timeout=300s
+echo "Waiting for CSV to reach Succeeded phase..."
+oc wait --for=jsonpath='{.status.phase}'=Succeeded "$CSV_NAME" -n multicluster-engine --timeout=300s
 
 # Create MultiClusterEngine instance
 echo "Creating MultiClusterEngine instance..."

hack/acm/install-operator.sh

@@ -7,18 +7,26 @@ set -euo pipefail
 echo "Installing ACM Operator (release 2.14)..."
 oc apply -k https://github.com/redhat-cop/gitops-catalog/advanced-cluster-management/operator/overlays/release-2.14
 
-# Wait for CSV to appear
+# Wait for CSV to appear and get its name
 echo "Waiting for ACM operator CSV to be ready..."
+CSV_NAME=""
 for i in {1..60}; do
-    if oc get csv -n open-cluster-management -o name 2>/dev/null | grep -q advanced-cluster-management; then
-        echo "ACM CSV found, waiting for Succeeded phase..."
+    CSV_NAME=$(oc get csv -n open-cluster-management -o name 2>/dev/null | grep advanced-cluster-management || true)
+    if [ -n "$CSV_NAME" ]; then
+        echo "ACM CSV found: $CSV_NAME"
         break
     fi
     echo "  Waiting for ACM CSV to appear ($i/60)..."
     sleep 5
 done
 
+if [ -z "$CSV_NAME" ]; then
+    echo "Error: ACM CSV not found after waiting"
+    exit 1
+fi
+
 # Wait for CSV to be ready
-oc wait --for=jsonpath='{.status.phase}'=Succeeded csv -l operators.coreos.com/advanced-cluster-management.open-cluster-management -n open-cluster-management --timeout=300s
+echo "Waiting for CSV to reach Succeeded phase..."
+oc wait --for=jsonpath='{.status.phase}'=Succeeded "$CSV_NAME" -n open-cluster-management --timeout=300s
 
 echo "✓ ACM Operator installation complete"