chore: stable multicluster deploy with acm import

Signed-off-by: Chris Butler <chris.butler@redhat.com>

Author: butler54

rhdp/wrapper-multicluster.sh

@@ -39,6 +39,23 @@ if ! command -v yq &> /dev/null; then
     exit 1
 fi
 
+# Check if podman is available and running
+if ! command -v podman &> /dev/null; then
+    echo "ERROR: podman is required but not installed"
+    echo "Please install podman: https://podman.io/getting-started/installation"
+    exit 1
+fi
+
+# Verify podman is running properly
+if ! podman info &> /dev/null; then
+    echo "ERROR: podman is installed but not responding"
+    echo "Please ensure the podman service is running"
+    echo "Try: podman machine start (for macOS/Windows) or check podman service status (for Linux)"
+    exit 1
+fi
+
+echo "✓ podman is available and running"
+
 # Extract clusterGroupName from values-global.yaml using yq
 CLUSTER_GROUP_NAME=$(yq eval '.main.clusterGroupName' values-global.yaml)
 
@@ -132,39 +149,20 @@ echo "starting pattern install on hub cluster"
 echo "---------------------"
 export KUBECONFIG="$(pwd)/openshift-install-hub/auth/kubeconfig"
 
-# Start pattern installation in background
-./pattern.sh make install &
-PATTERN_PID=$!
-echo "Pattern installation started in background (PID: $PATTERN_PID)"
+# Start pattern installation and capture exit code
+set +e
+./pattern.sh make install
+PATTERN_EXIT_CODE=$?
+set -e
 
 echo "---------------------"
 echo "creating spoke cluster (while pattern installs)"
 echo "---------------------"
-openshift-install create cluster --dir=./openshift-install-spoke --log-level=info &
-SPOKE_PID=$!
-echo "Spoke cluster creation started in background (PID: $SPOKE_PID)"
-
-# Wait for pattern installation to complete
-echo "Waiting for pattern installation to complete..."
-wait $PATTERN_PID
-PATTERN_EXIT_CODE=$?
-
-if [ $PATTERN_EXIT_CODE -ne 0 ]; then
-    echo "ERROR: Pattern installation failed with exit code $PATTERN_EXIT_CODE"
-else
-    echo "Pattern installation completed successfully!"
-fi
-
-# Wait for spoke cluster to complete
-echo "Waiting for spoke cluster creation to complete..."
-wait $SPOKE_PID
+set +e
+openshift-install create cluster --dir=./openshift-install-spoke --log-level=info
 SPOKE_EXIT_CODE=$?
+set -e
 
-if [ $SPOKE_EXIT_CODE -ne 0 ]; then
-    echo "WARNING: Spoke cluster creation failed with exit code $SPOKE_EXIT_CODE"
-else
-    echo "Spoke cluster creation completed successfully!"
-fi
 
 echo "---------------------"
 echo "Verifying ACM deployment on hub cluster"
@@ -287,8 +285,8 @@ EOF
 
     # Verify the label is set correctly
     CLUSTER_LABEL=$(kubectl get managedcluster coco-spoke -o jsonpath='{.metadata.labels.clusterGroup}' 2>/dev/null)
-    if [ "$CLUSTER_LABEL" == "untrustedSpoke" ]; then
-        echo "✓ Cluster label 'clusterGroup=untrustedSpoke' verified"
+    if [ "$CLUSTER_LABEL" == "untrusted-spoke" ]; then
+        echo "✓ Cluster label 'clusterGroup=untrusted-spoke' verified"
     else
         echo "WARNING: Cluster label is '$CLUSTER_LABEL' (expected: untrustedSpoke)"
     fi