[WIP] 🌱 Fill up supervisor e2e test - ClusterClass rollouts

[zhanggbj]

trafficstars

What this PR does / why we need it:

• Enable test "When testing ClusterClass rollouts"

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged): Part of #2995

[zhanggbj]

/test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-ci-latest-main /test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-main /test pull-cluster-api-provider-vsphere-e2e-govmomi-main /test pull-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-30-1-31-main /test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-ci-latest-main /test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-main /test pull-cluster-api-provider-vsphere-e2e-supervisor-main /test pull-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-30-1-31-main

[zhanggbj]

/test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-ci-latest-main /test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-main /test pull-cluster-api-provider-vsphere-e2e-govmomi-main /test pull-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-30-1-31-main /test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-ci-latest-main /test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-main /test pull-cluster-api-provider-vsphere-e2e-supervisor-main /test pull-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-30-1-31-main

[zhanggbj]

Tests failed as CAPV will add an extra label node.cluster.x-k8s.io/esxi-host on Machine by here, so labels won't be exactly equal to the Machine labels listed in the CAPI E2E tests here.

I'm thinking we may need to update the CAPI E2E tests, to make it check if the machine contains the 4 required labels instead of using BeEquivalentTo, does it make sense to you @fabriziopandini @sbueringer @chrischdi ? Thanks!

• Test Failure

      <map[string]string | len:5>: {
          "topology.cluster.x-k8s.io/owned": "",
          "cluster.x-k8s.io/cluster-name": "clusterclass-rollout-gnfvcg",
          "cluster.x-k8s.io/control-plane": "",
          "cluster.x-k8s.io/control-plane-name": "clusterclass-rollout-gnfvcg-cp-vngr8",
          "node.cluster.x-k8s.io/esxi-host": "10.2.32.5",
      }
  to be equivalent to
      <e2e.unionMap | len:4>: {
          "topology.cluster.x-k8s.io/owned": "",
          "cluster.x-k8s.io/cluster-name": "clusterclass-rollout-gnfvcg",
          "cluster.x-k8s.io/control-plane": "",
          "cluster.x-k8s.io/control-plane-name": "clusterclass-rollout-gnfvcg-cp-vngr8",
      }
  In [It

[sbueringer]

I think we should look into how we can extend the core CAPI test spec to allow for validation of additional labels. (basically a CAPV func would validate the esxi-host label and then core CAPI all the other ones)

[zhanggbj]

As we need to extend the CAPI E2E , I just opened a CAPI issue for further discussion, and I think it's the same situation for annotations check. https://github.com/kubernetes-sigs/cluster-api/pull/10715

[zhanggbj]

/test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-ci-latest-main /test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-main /test pull-cluster-api-provider-vsphere-e2e-govmomi-main /test pull-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-30-1-31-main /test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-ci-latest-main /test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-main /test pull-cluster-api-provider-vsphere-e2e-supervisor-main /test pull-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-30-1-31-main

[zhanggbj]

/test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-ci-latest-main /test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-main /test pull-cluster-api-provider-vsphere-e2e-govmomi-main /test pull-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-30-1-31-main /test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-ci-latest-main /test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-main /test pull-cluster-api-provider-vsphere-e2e-supervisor-main /test pull-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-30-1-31-main

[zhanggbj]

For the above failures, I think it should be fixed in capie2e side when checking object annotations, please find more details here --> https://github.com/kubernetes-sigs/cluster-api/issues/10839

[sbueringer]

Sounds good. Feel free to bump to CAPI main :D

[zhanggbj]

Bumped CAPI version.

[zhanggbj]

/test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-ci-latest-main /test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-main /test pull-cluster-api-provider-vsphere-e2e-govmomi-main /test pull-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-30-1-31-main /test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-ci-latest-main /test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-main /test pull-cluster-api-provider-vsphere-e2e-supervisor-main /test pull-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-30-1-31-main

[sbueringer]

Otherwise lgtm

[zhanggbj]

/test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-ci-latest-main /test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-main /test pull-cluster-api-provider-vsphere-e2e-govmomi-main /test pull-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-30-1-31-main /test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-ci-latest-main /test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-main /test pull-cluster-api-provider-vsphere-e2e-supervisor-main /test pull-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-30-1-31-main

[sbueringer]

Thank you very much!!

/lgtm /approve

[k8s-ci-robot]

LGTM label has been added.

Git tree hash: cdcb76f7fffab270340eb698975b5a2f310d9802

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• ~~OWNERS~~ [sbueringer]

Approvers can indicate their approval by writing /approve in a comment Approvers can cancel approval by writing /approve cancel in a comment