Skip to content

Commit e5d644a

Browse files
committed
Address review comments
1 parent 021bc22 commit e5d644a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

pkg/util/provider/machinecontroller/machine.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func (c *controller) deleteMachine(obj interface{}) {
8383
}
8484
machine, ok = tombstone.Obj.(*v1alpha1.Machine)
8585
if !ok {
86-
utilruntime.HandleError(fmt.Errorf("Tombstone contained object that is not a Machine %#v", obj))
86+
utilruntime.HandleError(fmt.Errorf("tombstone contained object that is not a Machine %#v", obj))
8787
return
8888
}
8989
}
@@ -794,7 +794,7 @@ func (c *controller) triggerDeletionFlow(ctx context.Context, deleteMachineReque
794794

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

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

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

880880
return !isMachineInCreationFlow && machine.DeletionTimestamp != nil

pkg/util/provider/machinecontroller/machine_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3873,7 +3873,7 @@ var _ = Describe("machine", func() {
38733873
},
38743874
},
38753875
expect: expect{
3876-
err: fmt.Errorf("Machine \"machine-0\" is in creation flow. Deletion cannot proceed"),
3876+
err: fmt.Errorf("machine \"machine-0\" is in creation flow. Deletion cannot proceed"),
38773877
retry: machineutils.MediumRetry,
38783878
machine: newMachine(
38793879
&v1alpha1.MachineTemplateSpec{

0 commit comments

Comments
 (0)