feat: complete spoke import in multicluster deploy script

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

Author: butler54

rhdp/wrapper-multicluster.sh

@@ -166,6 +166,139 @@ else
     echo "Spoke cluster creation completed successfully!"
 fi
 
+echo "---------------------"
+echo "Verifying ACM deployment on hub cluster"
+echo "---------------------"
+
+# Ensure we're using the hub cluster kubeconfig
+export KUBECONFIG="$(pwd)/openshift-install-hub/auth/kubeconfig"
+
+# Check if ACM namespace exists
+if ! kubectl get namespace open-cluster-management &> /dev/null; then
+    echo "WARNING: ACM namespace 'open-cluster-management' not found"
+    ACM_STATUS="FAILED"
+    exit 1
+else
+    echo "✓ ACM namespace exists"
+    
+    # Check MultiClusterHub status
+    MCH_STATUS=$(kubectl get multiclusterhub -n open-cluster-management -o jsonpath='{.items[0].status.phase}' 2>/dev/null || echo "NOT_FOUND")
+    
+    if [ "$MCH_STATUS" == "Running" ]; then
+        echo "✓ MultiClusterHub is Running"
+        ACM_STATUS="SUCCESS"
+    else
+        echo "WARNING: MultiClusterHub status is: $MCH_STATUS (expected: Running)"
+        ACM_STATUS="DEGRADED"
+        exit 1
+    fi
+fi
+ 
+ 
+echo "ACM Deployment Status: $ACM_STATUS"
+echo "---------------------"
+
+# Import spoke cluster into ACM if both ACM and spoke are successful
+if [ "$ACM_STATUS" == "SUCCESS" ] && [ $SPOKE_EXIT_CODE -eq 0 ]; then
+    echo "---------------------"
+    echo "Importing spoke cluster into ACM"
+    echo "---------------------"
+    
+    # Ensure we're using the hub cluster kubeconfig
+    export KUBECONFIG="$(pwd)/openshift-install-hub/auth/kubeconfig"
+    
+    # Create ManagedCluster resource with the required label
+    cat <<EOF | kubectl apply -f -
+apiVersion: cluster.open-cluster-management.io/v1
+kind: ManagedCluster
+metadata:
+  name: coco-spoke
+  labels:
+    clusterGroup: untrusted-spoke
+    cloud: auto-detect
+    vendor: auto-detect
+spec:
+  hubAcceptsClient: true
+EOF
+    
+    if [ $? -eq 0 ]; then
+        echo "✓ ManagedCluster resource created for coco-spoke"
+    else
+        echo "ERROR: Failed to create ManagedCluster resource"
+        exit 1
+    fi
+    
+    # Wait for import secret to be created
+    echo "Waiting for import secret to be generated..."
+    IMPORT_SECRET_WAIT=0
+    while [ $IMPORT_SECRET_WAIT -lt 60 ]; do
+        if kubectl get secret -n coco-spoke coco-spoke-import 2>/dev/null; then
+            echo "✓ Import secret generated"
+            break
+        fi
+        sleep 5
+        IMPORT_SECRET_WAIT=$((IMPORT_SECRET_WAIT + 5))
+    done
+    
+    if [ $IMPORT_SECRET_WAIT -ge 60 ]; then
+        echo "ERROR: Timeout waiting for import secret"
+        exit 1
+    fi
+    
+    # Extract and apply import manifests to spoke cluster
+    echo "Applying import manifests to spoke cluster..."
+    kubectl get secret -n coco-spoke coco-spoke-import -o jsonpath='{.data.import\.yaml}' | base64 --decode > /tmp/coco-spoke-import.yaml
+    kubectl get secret -n coco-spoke coco-spoke-import -o jsonpath='{.data.crds\.yaml}' | base64 --decode > /tmp/coco-spoke-crds.yaml
+    
+    # Switch to spoke cluster and apply import manifests
+    export KUBECONFIG="$(pwd)/openshift-install-spoke/auth/kubeconfig"
+    
+    echo "Applying CRDs to spoke cluster..."
+    kubectl apply -f /tmp/coco-spoke-crds.yaml
+    
+    echo "Applying import manifests to spoke cluster..."
+    kubectl apply -f /tmp/coco-spoke-import.yaml
+    
+    # Clean up temporary files
+    rm -f /tmp/coco-spoke-import.yaml /tmp/coco-spoke-crds.yaml
+    
+    # Switch back to hub cluster to verify import
+    export KUBECONFIG="$(pwd)/openshift-install-hub/auth/kubeconfig"
+    
+    echo "Waiting for spoke cluster to be imported and available..."
+    IMPORT_WAIT=0
+    while [ $IMPORT_WAIT -lt 300 ]; do
+        CLUSTER_STATUS=$(kubectl get managedcluster coco-spoke -o jsonpath='{.status.conditions[?(@.type=="ManagedClusterConditionAvailable")].status}' 2>/dev/null)
+        if [ "$CLUSTER_STATUS" == "True" ]; then
+            echo "✓ Spoke cluster successfully imported and available in ACM"
+            SPOKE_IMPORT_STATUS="SUCCESS"
+            break
+        fi
+        sleep 10
+        IMPORT_WAIT=$((IMPORT_WAIT + 10))
+        echo "Still waiting... ($IMPORT_WAIT/300 seconds)"
+    done
+    
+    if [ $IMPORT_WAIT -ge 300 ]; then
+        echo "WARNING: Spoke cluster import did not complete within 5 minutes"
+        echo "Current status: $CLUSTER_STATUS"
+        SPOKE_IMPORT_STATUS="TIMEOUT"
+    fi
+    
+    # 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"
+    else
+        echo "WARNING: Cluster label is '$CLUSTER_LABEL' (expected: untrustedSpoke)"
+    fi
+    
+    echo "---------------------"
+else
+    echo "Skipping spoke cluster import (ACM: $ACM_STATUS, Spoke Exit Code: $SPOKE_EXIT_CODE)"
+    SPOKE_IMPORT_STATUS="SKIPPED"
+fi
+
 echo "---------------------"
 echo "Deployment Summary"
 echo "---------------------"
@@ -179,12 +312,26 @@ else
     echo "Only hub cluster available"
 fi
 
+
+
 if [ $PATTERN_EXIT_CODE -eq 0 ]; then
     echo "Pattern: Successfully deployed to hub cluster"
 else
     echo "Pattern: FAILED to deploy (exit code: $PATTERN_EXIT_CODE)"
 fi
 
+if [ -n "$ACM_STATUS" ]; then
+    echo "ACM on hub cluster: $ACM_STATUS"
+fi
+
+if [ -n "$SPOKE_IMPORT_STATUS" ]; then
+    echo "Spoke cluster import to ACM: $SPOKE_IMPORT_STATUS"
+    if [ "$SPOKE_IMPORT_STATUS" == "SUCCESS" ]; then
+        echo "  - Cluster name: coco-spoke"
+        echo "  - Label: clusterGroup=untrustedSpoke"
+    fi
+fi
+
 echo "---------------------"
 echo "done"
 echo "---------------------"

values-global.yaml

@@ -15,7 +15,7 @@ main:
   # WARNING
   # This default configuration uses a single cluster on azure.
   # It fundamentally violates the separation of duties.
-  clusterGroupName: simple
+  clusterGroupName: trusted-hub
   multiSourceConfig:
     enabled: true
     clusterGroupChartVersion: 0.9.*