-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
🐛 remove disableMachineCreate annotation from new machinesets during rolling machine deployment reconciliation #11415
base: main
Are you sure you want to change the base?
Conversation
/area machinedeployment |
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Welcome @Patryk-Stefanski! |
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 Once the patch is verified, the new status will be reflected by the 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. |
05a906d
to
b7f875b
Compare
/ok-to-test |
b7f875b
to
bd6d544
Compare
…lling machine deployment reconciliation
bd6d544
to
5810d7b
Compare
func (r *Reconciler) cleanupDisableMachineCreateAnnotation(ctx context.Context, newMS *clusterv1.MachineSet) (*clusterv1.MachineSet, error) { | ||
log := ctrl.LoggerFrom(ctx) | ||
|
||
if newMS.Annotations != nil { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we also add some test coverage for this?
What this PR does / why we need it:
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 #