🐛 Add finalizer reconcile for Topology MachineSets and MachineDeployments

[killianmuldoon]

Signed-off-by: killianmuldoon [email protected]

Add reconciliation for the finalizer of MachineSets controlled by the topology controller. This ensures that if the finalizer is lost for any reason other than being removed by the topology/machineset controller it will be re-reconciled.

Fixes: #7530

[sbueringer]

One nit, otherwise lgtm

Would be interesting to see if we can implement the MD finalizer thing in the same way on the other PR

[sbueringer]

/cherry-pick release-1.2

[k8s-infra-cherrypick-robot]

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

In response to this:

/cherry-pick release-1.2

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/test-infra repository.

[sbueringer]

/cherry-pick release-1.3

[k8s-infra-cherrypick-robot]

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

In response to this:

/cherry-pick release-1.3

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/test-infra repository.

[sbueringer]

(bug fix we want in both release series)

[sbueringer]

Thank you very much!!

/lgtm

[sbueringer]

/assign @fabriziopandini

[fabriziopandini]

Great work nailing down this problem!
/lgtm
/approve

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

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 [fabriziopandini]

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

[sbueringer]

/check-cla

[sbueringer]

Thx!

(@fabriziopandini we had to commit --amend push force to re-trigger EasyCLA, it was stuck somehow)

/lgtm

[k8s-infra-cherrypick-robot]

@sbueringer: #7536 failed to apply on top of branch "release-1.2":

Applying: Add finalizer reconcile for Topology MachineDeployments and MachineSets
Using index info to reconstruct a base tree...
M	internal/controllers/machinedeployment/machinedeployment_sync.go
M	internal/controllers/topology/cluster/cluster_controller_test.go
M	internal/controllers/topology/cluster/desired_state.go
M	internal/controllers/topology/cluster/desired_state_test.go
M	internal/controllers/topology/machinedeployment/machinedeployment_controller.go
M	internal/controllers/topology/machineset/machineset_controller.go
M	internal/test/builder/builders.go
M	internal/test/builder/zz_generated.deepcopy.go
Falling back to patching base and 3-way merge...
Auto-merging internal/test/builder/zz_generated.deepcopy.go
Auto-merging internal/test/builder/builders.go
Auto-merging internal/controllers/topology/machineset/machineset_controller.go
CONFLICT (content): Merge conflict in internal/controllers/topology/machineset/machineset_controller.go
Auto-merging internal/controllers/topology/machinedeployment/machinedeployment_controller.go
CONFLICT (content): Merge conflict in internal/controllers/topology/machinedeployment/machinedeployment_controller.go
Auto-merging internal/controllers/topology/cluster/desired_state_test.go
Auto-merging internal/controllers/topology/cluster/desired_state.go
Auto-merging internal/controllers/topology/cluster/cluster_controller_test.go
Auto-merging internal/controllers/machinedeployment/machinedeployment_sync.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add finalizer reconcile for Topology MachineDeployments and MachineSets
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.2

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/test-infra repository.

[k8s-infra-cherrypick-robot]

@sbueringer: new pull request created: #7555

In response to this:

/cherry-pick release-1.3

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/test-infra repository.