Skip to content

Commit 9bbb31a

Browse files
ushabelgurushabelgur
authored
Harmonize Eventf messages (#659)
1 parent 30710b6 commit 9bbb31a

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

‎internal/controllers/machine_controller.go‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ func (r *MachineReconciler) Start(ctx context.Context) error {
157157

158158
for _, machine := range machines {
159159
if api.IsImageReferenced(machine, evt.Ref) {
160-
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeNormal, "PulledImage", "Pulled image %s", evt.Ref)
160+
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeNormal, "ImagePullSucceeded", "Pulled image %s", evt.Ref)
161161
log.V(1).Info("Image pulled: Requeue machines", "Image", evt.Ref, "Machine", machine.ID)
162162
r.queue.Add(machine.ID)
163163
}
@@ -301,7 +301,7 @@ func (r *MachineReconciler) processMachineDeletion(ctx context.Context, log logr
301301
if _, err := r.machines.Update(ctx, machine); store.IgnoreErrNotFound(err) != nil {
302302
return fmt.Errorf("failed to update machine metadata: %w", err)
303303
}
304-
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeNormal, "CompletedDeletion", "Deletion completed")
304+
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeNormal, "MachineDeletionSucceeded", "Deleted machine")
305305
log.V(1).Info("Removed Finalizer. Deletion completed")
306306

307307
return nil
@@ -340,15 +340,14 @@ func (r *MachineReconciler) destroyDomain(log logr.Logger, machine *api.Machine,
340340
return fmt.Errorf("failed to initiate forceful shutdown: %w", err)
341341
}
342342

343-
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeWarning, "DestroyedDomain", "Domain Destroyed")
343+
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeWarning, "DomainDestroySucceeded", "Domain destroyed")
344344

345345
log.V(1).Info("Destroyed domain")
346346
return nil
347347
}
348348

349349
func (r *MachineReconciler) shutdownMachine(log logr.Logger, machine *api.Machine, domain libvirt.Domain) (bool, error) {
350350
log.V(1).Info("Triggering shutdown", "ShutdownAt", machine.Spec.ShutdownAt)
351-
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeNormal, "TriggeringShutdown", "Shutdown Triggered")
352351

353352
shutdownMode := libvirt.DomainShutdownAcpiPowerBtn
354353
if machine.Spec.GuestAgent == api.GuestAgentQemu {
@@ -358,9 +357,12 @@ func (r *MachineReconciler) shutdownMachine(log logr.Logger, machine *api.Machin
358357
if libvirt.IsNotFound(err) {
359358
return false, nil
360359
}
360+
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeWarning, "TriggerShutdownFailed", "Failed to initiate shutdown: %s", err)
361361
return false, fmt.Errorf("failed to initiate shutdown: %w", err)
362362
}
363363

364+
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeNormal, "TriggerShutdownSucceeded", "Shutdown triggered")
365+
364366
return true, nil
365367
}
366368

@@ -500,13 +502,13 @@ func (r *MachineReconciler) updateDomain(
500502

501503
volumeStates, err := r.attachDetachVolumes(ctx, log, machine, attacher)
502504
if err != nil {
503-
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeWarning, "AttchDetachVolume", "Volume attach/detach failed with error: %s", err)
505+
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeWarning, "AttachDetachVolumeFailed", "Volume attach/detach failed: %s", err)
504506
return nil, nil, fmt.Errorf("[volumes] %w", err)
505507
}
506508

507509
nicStates, err := r.attachDetachNetworkInterfaces(ctx, log, machine, domainDesc)
508510
if err != nil {
509-
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeWarning, "AttchDetachNIC", "NIC attach/detach failed with error: %s", err)
511+
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeWarning, "AttachDetachNICFailed", "NIC attach/detach failed: %s", err)
510512
return nil, nil, fmt.Errorf("[network interfaces] %w", err)
511513
}
512514

@@ -707,7 +709,7 @@ func (r *MachineReconciler) domainFor(
707709
return nil, nil, nil, err
708710
}
709711
} else {
710-
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeWarning, "NoIgnitionData", "Machine does not have ignition data")
712+
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeWarning, "IgnitionDataNotFound", "Machine does not have ignition data")
711713
}
712714

713715
attacher, err := NewLibvirtVolumeAttacher(domainDesc, NewCreateDomainExecutor(r.host.Libvirt()), r.volumeCachePolicy)
@@ -717,20 +719,20 @@ func (r *MachineReconciler) domainFor(
717719

718720
volumeStates, err := r.attachDetachVolumes(ctx, log, machine, attacher)
719721
if err != nil {
720-
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeWarning, "AttchDetachVolume", "Volume attach/detach failed with error: %s", err)
722+
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeWarning, "AttachDetachVolumeFailed", "Failed to attach/detach volume: %s", err)
721723
return nil, nil, nil, err
722724
}
723725
if machine.Spec.Volumes != nil {
724-
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeNormal, "AttchedVolume", "Successfully attached volumes")
726+
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeNormal, "AttachVolumeSucceeded", "Attached volumes")
725727
}
726728

727729
nicStates, err := r.setDomainNetworkInterfaces(ctx, machine, domainDesc)
728730
if err != nil {
729-
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeWarning, "AttchDetachNIC", "Setting domain network interface failed with error: %s", err)
731+
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeWarning, "AttachDetachNICFailed", "Failed to set domain network interface: %s", err)
730732
return nil, nil, nil, err
731733
}
732734
if machine.Spec.NetworkInterfaces != nil {
733-
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeNormal, "AttchedNIC", "Successfully attached network interfaces")
735+
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeNormal, "AttachNICSucceeded", "Attached network interfaces")
734736
}
735737

736738
return domainDesc, volumeStates, nicStates, nil

‎internal/server/event_list_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ var _ = Describe("ListEvents", func() {
6565
Expect(resp.Events).To(ContainElement(
6666
HaveField("Spec", SatisfyAll(
6767
HaveField("InvolvedObjectMeta.Id", Equal(createResp.Machine.Metadata.Id)),
68-
HaveField("Reason", Equal("NoIgnitionData")),
68+
HaveField("Reason", Equal("IgnitionDataNotFound")),
6969
HaveField("Message", Equal("Machine does not have ignition data")),
7070
HaveField("Type", Equal(corev1.EventTypeWarning)),
7171
)),
@@ -83,7 +83,7 @@ var _ = Describe("ListEvents", func() {
8383
Expect(resp.Events).To(ContainElement(
8484
HaveField("Spec", SatisfyAll(
8585
HaveField("InvolvedObjectMeta.Id", Equal(createResp.Machine.Metadata.Id)),
86-
HaveField("Reason", Equal("NoIgnitionData")),
86+
HaveField("Reason", Equal("IgnitionDataNotFound")),
8787
HaveField("Message", Equal("Machine does not have ignition data")),
8888
HaveField("Type", Equal(corev1.EventTypeWarning)),
8989
)),

0 commit comments

Comments
 (0)