Workload cluster deployment failing because of circular dependency

Job #12253706609 failed for f3c9c742:

cluster-machines-ready -> calico -> calico-crd -> cluster-reachable -> cluster -> rancher-fleet-agent-drain-fix -> calico-ready -> calico
Error: exiting as condition "reason" equals "InstallFailed" in unit HelmRelease/sylva-units, message: Helm install failed for release kubeadm-capm3-virt/sylva-units with chart sylva-units@0.0.0-git-f3c9c742+1: execution error at (sylva-units/templates/units.yaml:17:40): unit calico is involved in a circular dependency:

Also observed in https://gitlab.com/sylva-projects/sylva-core/-/jobs/12253715430

This is being caused by the merge of !6212 (merged), because base-deps in workload-cluster has:

  base-deps:
    # we put here the list of base units that most units will need to depend on
    # they correspond to "the workload cluster is ready for stuff to be deployed on it"
    depends_on:
      cluster-reachable: true
      namespace-defs: true
      calico-ready: '{{ and (tuple . "calico-ready" | include "unit-enabled") (not .Values._internal.state.is_upgrade) }}'

cc @tmmorin