Skip to content

Safeguard to prevent termination of machines part of creation flow #1036

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.

Sign up for GitHub

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

Merged
aaronfern merged 3 commits into from
Oct 15, 2025
Merged

Safeguard to prevent termination of machines part of creation flow #1036

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cfdf298
pendingCreateMachine safety map to prevent early termination
takoverflow Oct 10, 2025
021bc22
feat(pendingCreateMachineMap): add unit tests
takoverflow Oct 13, 2025
e5d644a
Address review comments
takoverflow Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Address review comments
  • Loading branch information
@takoverflow
takoverflow committed Oct 13, 2025
commit e5d644a9bc7c4a6eedd683172181584a8da41c98
6 changes: 3 additions & 3 deletions pkg/util/provider/machinecontroller/machine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func (c *controller) deleteMachine(obj interface{}) {
}
machine, ok = tombstone.Obj.(*v1alpha1.Machine)
if !ok {
utilruntime.HandleError(fmt.Errorf("Tombstone contained object that is not a Machine %#v", obj))
utilruntime.HandleError(fmt.Errorf("tombstone contained object that is not a Machine %#v", obj))
return
}
}
Expand Down Expand Up @@ -794,7 +794,7 @@ func (c *controller) triggerDeletionFlow(ctx context.Context, deleteMachineReque

switch {
case isMachineInCreationFlow:
err := fmt.Errorf("Machine %q is in creation flow. Deletion cannot proceed", machine.Name)
err := fmt.Errorf("machine %q is in creation flow. Deletion cannot proceed", machine.Name)
return machineutils.MediumRetry, err

case !finalizers.Has(MCMFinalizerName):
Expand Down Expand Up @@ -874,7 +874,7 @@ func (c *controller) shouldMachineBeMovedToTerminatingQueue(machine *v1alpha1.Ma
_, isMachineInCreationFlow := c.pendingMachineCreationMap.Load(machine.Name)

if machine.DeletionTimestamp != nil && isMachineInCreationFlow {
klog.Infof("Cannot delete machine %q, its deletionTimestamp is set but it is currently being processed by the creation flow\n", machine.Name)
klog.Warningf("Cannot delete machine %q, its deletionTimestamp is set but it is currently being processed by the creation flow\n", machine.Name)
}

return !isMachineInCreationFlow && machine.DeletionTimestamp != nil
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/provider/machinecontroller/machine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3873,7 +3873,7 @@ var _ = Describe("machine", func() {
},
},
expect: expect{
err: fmt.Errorf("Machine \"machine-0\" is in creation flow. Deletion cannot proceed"),
err: fmt.Errorf("machine \"machine-0\" is in creation flow. Deletion cannot proceed"),
retry: machineutils.MediumRetry,
machine: newMachine(
&v1alpha1.MachineTemplateSpec{
Expand Down
Loading