ClusterClass: controlplane MHC setting bad selector labels

[swarren83]

What steps did you take and what happened?

Specifying a machineHealthCheck in spec.controlPlane sets the following selector labels up on the MHC resource:

  selector:
    matchLabels:
      cluster.x-k8s.io/control-plane: ''
      topology.cluster.x-k8s.io/owned: ''

While the control plane machines are getting the following labels set:

  labels:
    cluster.x-k8s.io/cluster-name: my-awesome-cluster
    cluster.x-k8s.io/control-plane: ''

Example mhc configuration

spec:
  controlPlane:
    machineHealthCheck:
      maxUnhealthy: 33%
      nodeStartupTimeout: 10m0s
      unhealthyConditions:
        - status: Unknown
          timeout: 5m0s
          type: Ready
        - status: 'False'
          timeout: 5m0s
          type: Ready

What did you expect to happen?

The MHC resource spec.selector.matchLabels should be such that they match labels applied to the control plane Machine.

Cluster API version

v1.8.4

Kubernetes version

v1.27.14

Anything else you would like to add?

CAPI is running on a Rancher cluster, v2.7.9

Label(s) to be applied

/kind bug
One or more /area label. See https://github.com/kubernetes-sigs/cluster-api/labels?q=area for the list of labels.

[k8s-ci-robot]

This issue is currently awaiting triage.

If CAPI contributors determine this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.