fix: guard against nil hub in spoke upgrade; only delete spokes managed by the hub being deleted

Signed-off-by: Artur Shad Nik <arturshadnik@gmail.com>

Author: arturshadnik

fleetconfig-controller/internal/controller/v1beta1/hub_controller.go

@@ -196,7 +196,7 @@ func (r *HubReconciler) cleanHub(ctx context.Context, hub *v1beta1.Hub) error {
 		// Mark all Spokes for deletion if they haven't been deleted yet
 		for i := range spokes {
 			spoke := &spokes[i]
-			if spoke.DeletionTimestamp.IsZero() {
+			if spoke.DeletionTimestamp.IsZero() && spoke.Spec.HubRef.Name == hub.Name {
 				logger.Info("Marking Spoke for deletion", "spoke", spoke.Name)
 				if err := r.Delete(ctx, spoke); err != nil && !kerrs.IsNotFound(err) {
 					return fmt.Errorf("failed to delete spoke %s: %w", spoke.Name, err)

fleetconfig-controller/internal/controller/v1beta1/spoke_controller.go

@@ -384,14 +384,16 @@ func (r *SpokeReconciler) handleSpoke(ctx context.Context, spoke *v1beta1.Spoke,
 	if err != nil {
 		return fmt.Errorf("failed to compute hash of spoke %s klusterlet values: %w", spoke.Name, err)
 	}
-	upgrade, err := r.spokeNeedsUpgrade(ctx, spoke, currKlusterletHash, hub.Spec.ClusterManager.Source)
-	if err != nil {
-		return fmt.Errorf("failed to check if spoke cluster needs upgrade: %w", err)
-	}
+	if hub != nil && hub.Spec.ClusterManager.Source.BundleVersion != "" {
+		upgrade, err := r.spokeNeedsUpgrade(ctx, spoke, currKlusterletHash, hub.Spec.ClusterManager.Source)
+		if err != nil {
+			return fmt.Errorf("failed to check if spoke cluster needs upgrade: %w", err)
+		}
 
-	if upgrade {
-		if err := r.upgradeSpoke(ctx, spoke, klusterletValues, hub.Spec.ClusterManager.Source); err != nil {
-			return fmt.Errorf("failed to upgrade spoke cluster %s: %w", spoke.Name, err)
+		if upgrade {
+			if err := r.upgradeSpoke(ctx, spoke, klusterletValues, hub.Spec.ClusterManager.Source); err != nil {
+				return fmt.Errorf("failed to upgrade spoke cluster %s: %w", spoke.Name, err)
+			}
 		}
 	}