🐛 Allow unsetting useExperimentalRetryJoin field from KubeadmControlPlane

[MaxFedotov]

….

What this PR does / why we need it:
Allow to drop useExperimentalRetryJoin from KubeadmControlPlane.kubeadmConfigSpec

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 #9169

[k8s-ci-robot]

Hi @MaxFedotov. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

[fabriziopandini]

/hold cancel
/ok-to-test

[furkatgofurov7]

/area provider/control-plane-kubeadm

[sbueringer]

Looks okay in general +/- unit test failures

[sbueringer]

/lgtm

[k8s-ci-robot]

LGTM label has been added.

Git tree hash: 21a05d718b8a15c753f57fa96077fd4edf30caf9

[killianmuldoon]

/lgtm
/approve

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: killianmuldoon

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

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

[killianmuldoon]

/cherry-pick release-1.5

[k8s-infra-cherrypick-robot]

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

In response to this:

/cherry-pick release-1.5

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.

[killianmuldoon]

/cherry-pick release-1.4

[k8s-infra-cherrypick-robot]

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

In response to this:

/cherry-pick release-1.4

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]

@killianmuldoon: #9170 failed to apply on top of branch "release-1.5":

Applying: Allow to drop useExperimentalRetryJoin field from KubeadmControlPlane.kubeadmConfigSpec
Using index info to reconstruct a base tree...
M	controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook.go
M	controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook_test.go
Falling back to patching base and 3-way merge...
Auto-merging controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook_test.go
CONFLICT (content): Merge conflict in controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook_test.go
Auto-merging controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook.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 Allow to drop useExperimentalRetryJoin field from KubeadmControlPlane.kubeadmConfigSpec
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.5

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]

@MaxFedotov Do you have some time to open manual cherry-picks for this PR?

[k8s-infra-cherrypick-robot]

@killianmuldoon: #9170 failed to apply on top of branch "release-1.4":

Applying: Allow to drop useExperimentalRetryJoin field from KubeadmControlPlane.kubeadmConfigSpec
Using index info to reconstruct a base tree...
M	controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook.go
M	controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook_test.go
Falling back to patching base and 3-way merge...
Auto-merging controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook_test.go
CONFLICT (content): Merge conflict in controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook_test.go
Auto-merging controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook.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 Allow to drop useExperimentalRetryJoin field from KubeadmControlPlane.kubeadmConfigSpec
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.4

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.

[MaxFedotov]

@sbueringer yes, sure. Just make 2 separate pull requests into release-1.4 and release-1.5 branches?

[sbueringer]

Yes! Basically apply a cherry-pick of this commit to both branches and resolve conflicts

[vincepri]

Late feedback, PR title threw me off thinking we were about to remove the field from the APIs; rather it's just allowing it to change. Might need a reword in release notes later

[sbueringer]

/retitle 🐛 Allow unsetting useExperimentalRetryJoin field from KubeadmControlPlane

Won't help for the v1.6 release notes, but let's use this title for the cherry-picks

[furkatgofurov7]

Won't help for the v1.6 release notes, but let's use this title for the cherry-picks

We should take this into account this while publishing the upcoming release release notes

/cc @g-gaston