Skip to content

Commit b0170a0

Browse files
detiberk8s-ci-robot
authored andcommitted
Add events to MachineSet operations (kubernetes-sigs#1012)
Add events to the following MachineSet operations - Adopt Machine - Create Machine - Delete Machine
1 parent 5f71f0b commit b0170a0

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

pkg/controller/machineset/machineset_controller.go

+10-1
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,12 @@ func (r *ReconcileMachineSet) reconcile(ctx context.Context, machineSet *cluster
208208
// Attempt to adopt machine if it meets previous conditions and it has no controller references.
209209
if metav1.GetControllerOf(machine) == nil {
210210
if err := r.adoptOrphan(machineSet, machine); err != nil {
211-
klog.Warningf("Failed to adopt MachineSet %q into MachineSet %q: %v", machine.Name, machineSet.Name, err)
211+
klog.Warningf("Failed to adopt Machine %q into MachineSet %q: %v", machine.Name, machineSet.Name, err)
212+
r.recorder.Eventf(machineSet, corev1.EventTypeWarning, "FailedAdopt", "Failed to adopt Machine %q: %v", machine.Name, err)
212213
continue
213214
}
215+
klog.Infof("Adopted Machine %q into MachineSet %q", machine.Name, machineSet.Name)
216+
r.recorder.Eventf(machineSet, corev1.EventTypeNormal, "SuccessfulAdopt", "Adopted Machine %q", machine.Name)
214217
}
215218

216219
filteredMachines = append(filteredMachines, machine)
@@ -298,9 +301,12 @@ func (r *ReconcileMachineSet) syncReplicas(ms *clusterv1alpha1.MachineSet, machi
298301
machine := r.createMachine(ms)
299302
if err := r.Client.Create(context.Background(), machine); err != nil {
300303
klog.Errorf("Unable to create Machine %q: %v", machine.Name, err)
304+
r.recorder.Eventf(ms, corev1.EventTypeWarning, "FailedCreate", "Failed to create machine %q: %v", machine.Name, err)
301305
errstrings = append(errstrings, err.Error())
302306
continue
303307
}
308+
klog.Infof("Created machine %d of %d with name %q", i+1, diff, machine.Name)
309+
r.recorder.Eventf(ms, corev1.EventTypeNormal, "SuccessfulCreate", "Created machine %q", machine.Name)
304310

305311
machineList = append(machineList, machine)
306312
}
@@ -332,8 +338,11 @@ func (r *ReconcileMachineSet) syncReplicas(ms *clusterv1alpha1.MachineSet, machi
332338
err := r.Client.Delete(context.Background(), targetMachine)
333339
if err != nil {
334340
klog.Errorf("Unable to delete Machine %s: %v", targetMachine.Name, err)
341+
r.recorder.Eventf(ms, corev1.EventTypeWarning, "FailedDelete", "Failed to delete machine %q: %v", targetMachine.Name, err)
335342
errCh <- err
336343
}
344+
klog.Infof("Deleted machine %q", targetMachine.Name)
345+
r.recorder.Eventf(ms, corev1.EventTypeNormal, "SuccessfulDelete", "Deleted machine %q", targetMachine.Name)
337346
}(machine)
338347
}
339348
wg.Wait()

0 commit comments

Comments
 (0)