/cherry-pick release-1.9

@sbueringer: once the present PR merges, I will cherry-pick it on top of release-1.9 in a new PR and assign it to you.

/cherry-pick release-1.8

@sbueringer: once the present PR merges, I will cherry-pick it on top of release-1.8 in a new PR and assign it to you.

/assign @fabriziopandini @chrischdi

LGTM label has been added.

Thanks for fixing this! /lgtm

I'm wondering if we should also stop to update MD when they are deleting

cluster-api/internal/controllers/topology/cluster/reconcile_state.go

Line 1106 in 359fc99

diff.toUpdate = append(diff.toUpdate, md)

The use case would roughly be:

• MD deleted
• MD added back before deletion completes,
• Topology tries to update the deleting MD

Instead we should probaly do nothing until current MD goes away

@sbueringer WDYT?

I went through all the usages of currentState.MD and I believe this code is not hit.

The reason is that MD deletions are triggered by removing MD topologies from Cluster.spec.topology. In that case we hit this line instead:

EDIT: okay got it, I'll take a look

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from chrischdi. For more information see the Code Review Process.

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

/test pull-cluster-api-e2e-main

@fabriziopandini PTAL :)

thanks!
/lgtm

cc @chrischdi for a final pass

LGTM label has been added.