🐛 Carry over metadata.uid at ServerSidePatchHelper

[chrischdi]

What this PR does / why we need it:

This prevents the race condition of running server side apply on an object which got:

• deleted in the meantime
• recreated in the meantime

and the topology controller won't apply using outdated information anymore.

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

[chrischdi]

/test all

[chrischdi]

/test all

[sbueringer]

/test pull-cluster-api-e2e-full-main

[sbueringer]

/lgtm

[chrischdi]

/test all

[sbueringer]

lgtm one nit
except if we want to move it to desired_state, but for me it's fine where it is

[chrischdi]

lgtm one nit except if we want to move it to desired_state, but for me it's fine where it is

The issue with desired_state is: we don't know if we want to update (in-place -> keep uid) or recreate (template rotation -> no uid) the object.

[sbueringer]

lgtm one nit except if we want to move it to desired_state, but for me it's fine where it is

The issue with desired_state is: we don't know if we want to update (in-place -> keep uid) or recreate (template rotation -> no uid) the object.

Ah good point / reason to keep it as is

[sbueringer]

/lgtm

[sbueringer]

/lgtm
/approve

/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:

/lgtm
/approve

/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]

/hold

Let's see if it is a new flake
/test pull-cluster-api-test-main

[sbueringer]

/test pull-cluster-api-test-main

[chrischdi]

We'll have to wait for #6773 to merge first. Afterwards this one should turn green.

[sbueringer]

As Christian investigated: the test failure only occur with this PR but it is fixed in combination with #6773.

We will merge #6773 first and then re-run the tests and then merge #6742

[sbueringer]

Rebased as #6773 has been merged

[sbueringer]

/lgtm

But let's keep the hold to run the tests a few times to make sure we're not introducing flakes

[sbueringer]

/test pull-cluster-api-test-main

[sbueringer]

/test pull-cluster-api-test-main

[sbueringer]

/test pull-cluster-api-test-main

[sbueringer]

/test pull-cluster-api-test-main

[sbueringer]

/test pull-cluster-api-test-main

[ykakarap]

/lgtm

[sbueringer]

/test pull-cluster-api-test-main

[sbueringer]

Looks pretty stable

/approve

[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

[sbueringer]

/hold cancel

[k8s-infra-cherrypick-robot]

@sbueringer: new pull request created: #6784

In response to this:

/lgtm
/approve

/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.