🐛 remove disableMachineCreate annotation from new machinesets during rolling machine deployment reconciliation

[Patryk-Stefanski]

What this PR does / why we need it:

1. Create a cluster with rolling machine deployment.
2. Change to onDelete machine deployment
3. Make some change to generate new machineSet
4. DisableMachineCreateAnnotation is set on old machineSet, while new machineSet scales up
5. Switch back to rolling machine deployment
6. Removing the change made in step 3 will try to use the old machineSet but new machines wont be created because of the annotation.

The flow above prevents machines from being created with the following error Automatic creation of new machines disabled for machine set . We should remove this annotation during the machine deployment rolling reconciliation.

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 #

[Patryk-Stefanski]

/area machinedeployment

[k8s-ci-robot]

[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 assign neolit123 for approval. For more information see the Kubernetes Code Review Process.

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

Needs approval from an approver in each of these files:

• OWNERS

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

[k8s-ci-robot]

Welcome @Patryk-Stefanski!

It looks like this is your first PR to kubernetes-sigs/cluster-api 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

[k8s-ci-robot]

Hi @Patryk-Stefanski. 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-sigs/prow repository.

[enxebre]

/ok-to-test

[chrischdi]

this duplicates the removal code. Also it would run twice in the onDelete case so we should be able to remove it there.

Maybe also move it to the top of this function.

Caveat: with doing this it won't be possible (anymore) to manually set this annotation on a MS if it is the new machineset for the normal rollout type. But IMHO this should be okay, because the MD controller owns the MS.

[Patryk-Stefanski]

It will never fully run twice since its checking the annotation on the MS if one run removes it the second one shouldn't run because the annotation isn't there. I can add a check before calling the function to check the annotation exists if that helps?

[chrischdi]

my point is: I think we don't need it at ondelete anymore / we only need this code once :-)

[Patryk-Stefanski]

I think we do need it if a user updates the MD and it creates a new MS the old one gets the annotation added. If the user undoes his changes the controller will attempt to use the old MS with the annotation that will prevent machines from coming up. So I think we need logic for the removal of this annotation in both onDelete and Rolling.

Please correct me if my understanding is wrong.

[chrischdi]

Could we also add some test coverage for this?