Skip to content

Harmonize Eventf messages #659

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
lukasfrank merged 2 commits into from
Nov 20, 2025
Merged

Harmonize Eventf messages #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f32facd
Harmonise event related messages
ushabelgur Nov 12, 2025
deda6ea
fix integration test
ushabelgur Nov 12, 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
24 changes: 13 additions & 11 deletions internal/controllers/machine_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func (r *MachineReconciler) Start(ctx context.Context) error {

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

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

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

log.V(1).Info("Destroyed domain")
return nil
}

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

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

r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeNormal, "TriggerShutdownSucceeded", "Shutdown triggered")

return true, nil
}

Expand Down Expand Up @@ -500,13 +502,13 @@ func (r *MachineReconciler) updateDomain(

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

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

Expand Down Expand Up @@ -707,7 +709,7 @@ func (r *MachineReconciler) domainFor(
return nil, nil, nil, err
}
} else {
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeWarning, "NoIgnitionData", "Machine does not have ignition data")
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeWarning, "IgnitionDataNotFound", "Machine does not have ignition data")
}

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

volumeStates, err := r.attachDetachVolumes(ctx, log, machine, attacher)
if err != nil {
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeWarning, "AttchDetachVolume", "Volume attach/detach failed with error: %s", err)
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeWarning, "AttachDetachVolumeFailed", "Failed to attach/detach volume: %s", err)
return nil, nil, nil, err
}
if machine.Spec.Volumes != nil {
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeNormal, "AttchedVolume", "Successfully attached volumes")
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeNormal, "AttachVolumeSucceeded", "Attached volumes")
}

nicStates, err := r.setDomainNetworkInterfaces(ctx, machine, domainDesc)
if err != nil {
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeWarning, "AttchDetachNIC", "Setting domain network interface failed with error: %s", err)
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeWarning, "AttachDetachNICFailed", "Failed to set domain network interface: %s", err)
return nil, nil, nil, err
}
if machine.Spec.NetworkInterfaces != nil {
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeNormal, "AttchedNIC", "Successfully attached network interfaces")
r.eventRecorder.Eventf(machine.Metadata, corev1.EventTypeNormal, "AttachNICSucceeded", "Attached network interfaces")
}

return domainDesc, volumeStates, nicStates, nil
Expand Down
4 changes: 2 additions & 2 deletions internal/server/event_list_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ var _ = Describe("ListEvents", func() {
Expect(resp.Events).To(ContainElement(
HaveField("Spec", SatisfyAll(
HaveField("InvolvedObjectMeta.Id", Equal(createResp.Machine.Metadata.Id)),
HaveField("Reason", Equal("NoIgnitionData")),
HaveField("Reason", Equal("IgnitionDataNotFound")),
HaveField("Message", Equal("Machine does not have ignition data")),
HaveField("Type", Equal(corev1.EventTypeWarning)),
)),
Expand All @@ -83,7 +83,7 @@ var _ = Describe("ListEvents", func() {
Expect(resp.Events).To(ContainElement(
HaveField("Spec", SatisfyAll(
HaveField("InvolvedObjectMeta.Id", Equal(createResp.Machine.Metadata.Id)),
HaveField("Reason", Equal("NoIgnitionData")),
HaveField("Reason", Equal("IgnitionDataNotFound")),
HaveField("Message", Equal("Machine does not have ignition data")),
HaveField("Type", Equal(corev1.EventTypeWarning)),
)),
Expand Down
Loading