Add get events command to irictl-machine

.reuse/dep5

@@ -22,6 +22,8 @@ Files:
   hack/*
   iri/apis/bucket/v1alpha1/api.pb.go
   iri/apis/bucket/v1alpha1/api.proto
+  iri/apis/event/v1alpha1/api.pb.go
+  iri/apis/event/v1alpha1/api.proto
   iri/apis/machine/v1alpha1/api.pb.go
   iri/apis/machine/v1alpha1/api.proto
   iri/apis/meta/v1alpha1/api.pb.go

broker/machinebroker/apiutils/apiutils.go

@@ -167,19 +167,3 @@ func IsManagedBy(o metav1.Object, manager string) bool {
 	actual, ok := o.GetLabels()[machinebrokerv1alpha1.ManagerLabel]
 	return ok && actual == manager
 }
-
-func GetIRIObjectMetadata(o metav1.Object) *irimeta.ObjectMetadata {
-	var deletedAt int64
-	if !o.GetDeletionTimestamp().IsZero() {
-		deletedAt = o.GetDeletionTimestamp().UnixNano()
-	}
-
-	return &irimeta.ObjectMetadata{
-		Id:          o.GetName(),
-		Annotations: o.GetAnnotations(),
-		Labels:      o.GetLabels(),
-		Generation:  o.GetGeneration(),
-		CreatedAt:   o.GetCreationTimestamp().UnixNano(),
-		DeletedAt:   deletedAt,
-	}
-}

broker/machinebroker/server/event_list.go

@@ -10,84 +10,93 @@ import (
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/labels"
+	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	computev1alpha1 "github.com/ironcore-dev/ironcore/api/compute/v1alpha1"
 	"github.com/ironcore-dev/ironcore/broker/machinebroker/apiutils"
+	irievent "github.com/ironcore-dev/ironcore/iri/apis/event/v1alpha1"
 	iri "github.com/ironcore-dev/ironcore/iri/apis/machine/v1alpha1"
 )
 
-const InvolvedObjectName = "involvedObject.name"
+const (
+	InvolvedObjectKind               = "Machine"
+	InvolvedObjectKindSelector       = "involvedObject.kind"
+	InvolvedObjectAPIVersionSelector = "involvedObject.apiVersion"
+)
 
-func (s *Server) listEvents(ctx context.Context, machineID string) ([]*iri.Event, error) {
+func (s *Server) listEvents(ctx context.Context) ([]*irievent.Event, error) {
+	log := ctrl.LoggerFrom(ctx)
 	machineEventList := &v1.EventList{}
-	selectorField := fields.Set{}
-	selectorField[InvolvedObjectName] = machineID
-
+	selectorField := fields.Set{
+		InvolvedObjectKindSelector:       InvolvedObjectKind,
+		InvolvedObjectAPIVersionSelector: computev1alpha1.SchemeGroupVersion.String(),
+	}
 	if err := s.cluster.Client().List(ctx, machineEventList,
 		client.InNamespace(s.cluster.Namespace()), client.MatchingFieldsSelector{Selector: selectorField.AsSelector()},
 	); err != nil {
-		return nil, fmt.Errorf("error listing machine events: %w", err)
+		return nil, err
 	}
 
-	var iriEvents []*iri.Event
+	var iriEvents []*irievent.Event
 	for _, machineEvent := range machineEventList.Items {
-		iriEvent := &iri.Event{
-			Metadata: apiutils.GetIRIObjectMetadata(&machineEvent.ObjectMeta),
-			Spec: &iri.EventSpec{
-				Reason:    machineEvent.Reason,
-				Message:   machineEvent.Message,
-				Type:      machineEvent.Type,
-				EventTime: machineEvent.FirstTimestamp.Unix(),
+		ironcoreMachine, err := s.getIronCoreMachine(ctx, machineEvent.InvolvedObject.Name)
+		if err != nil {
+			log.V(1).Info("Unable to get ironcore machine", "MachineName", machineEvent.InvolvedObject.Name)
+			continue
+		}
+		machineObjectMetadata, err := apiutils.GetObjectMetadata(&ironcoreMachine.ObjectMeta)
+		if err != nil {
+			continue
+		}
+		iriEvent := &irievent.Event{
+			Spec: &irievent.EventSpec{
+				InvolvedObjectMeta: machineObjectMetadata,
+				Reason:             machineEvent.Reason,
+				Message:            machineEvent.Message,
+				Type:               machineEvent.Type,
+				EventTime:          machineEvent.LastTimestamp.Unix(),
 			},
 		}
 		iriEvents = append(iriEvents, iriEvent)
 	}
 	return iriEvents, nil
 }
 
-func (s *Server) filterEvents(events []*iri.Event, filter *iri.EventFilter) []*iri.Event {
+func (s *Server) filterEvents(events []*irievent.Event, filter *iri.EventFilter) []*irievent.Event {
 	if filter == nil {
 		return events
 	}
 
 	var (
-		res []*iri.Event
+		res []*irievent.Event
 		sel = labels.SelectorFromSet(filter.LabelSelector)
 	)
 	for _, iriEvent := range events {
-		if !sel.Matches(labels.Set(iriEvent.Metadata.Labels)) {
+		if !sel.Matches(labels.Set(iriEvent.Spec.InvolvedObjectMeta.Labels)) {
 			continue
 		}
-		if (filter.EventsFromTime >= 0 && iriEvent.Spec.EventTime >= filter.EventsFromTime) && (filter.EventsToTime >= 0 && iriEvent.Spec.EventTime <= filter.EventsToTime) {
-			res = append(res, iriEvent)
+
+		if filter.EventsFromTime > 0 && filter.EventsToTime > 0 {
+			if iriEvent.Spec.EventTime < filter.EventsFromTime || iriEvent.Spec.EventTime > filter.EventsToTime {
+				continue
+			}
 		}
 
+		res = append(res, iriEvent)
 	}
 	return res
 }
 
 func (s *Server) ListEvents(ctx context.Context, req *iri.ListEventsRequest) (*iri.ListEventsResponse, error) {
-	ironcoreMachineList, err := s.listIroncoreMachines(ctx)
+	iriEvents, err := s.listEvents(ctx)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("error listing machine events : %w", err)
 	}
-	var machineEvents []*iri.MachineEvents
-	for i := range ironcoreMachineList.Items {
-		ironcoreMachine := &ironcoreMachineList.Items[i]
-		iriEvents, err := s.listEvents(ctx, ironcoreMachine.Name)
-		if err != nil {
-			return nil, err
-		}
 
-		iriEvents = s.filterEvents(iriEvents, req.Filter)
-		ironcoreMachineMeta, err := apiutils.GetObjectMetadata(&ironcoreMachine.ObjectMeta)
-		if err != nil {
-			return nil, fmt.Errorf("error listing machine events: %w", err)
-		}
-		machineEvents = append(machineEvents, &iri.MachineEvents{InvolvedObjectMeta: ironcoreMachineMeta, Events: iriEvents})
-	}
+	iriEvents = s.filterEvents(iriEvents, req.Filter)
 
 	return &iri.ListEventsResponse{
-		MachineEvents: machineEvents,
+		Events: iriEvents,
 	}, nil
 }

broker/machinebroker/server/event_list_test.go

@@ -4,6 +4,8 @@
 package server_test
 
 import (
+	"time"
+
 	computev1alpha1 "github.com/ironcore-dev/ironcore/api/compute/v1alpha1"
 	networkingv1alpha1 "github.com/ironcore-dev/ironcore/api/networking/v1alpha1"
 	iri "github.com/ironcore-dev/ironcore/iri/apis/machine/v1alpha1"
@@ -64,23 +66,62 @@ var _ = Describe("ListEvents", func() {
 		Expect(k8sClient.Get(ctx, ironcoreMachineKey, ironcoreMachine)).To(Succeed())
 
 		By("generating the machine events")
+		eventGeneratedTime := time.Now()
 		eventRecorder := k8sManager.GetEventRecorderFor("test-recorder")
 		eventRecorder.Event(ironcoreMachine, corev1.EventTypeNormal, "testing", "this is test event")
 
-		By("listing the machine events")
+		By("listing the machine events with no filters")
 		resp, err := srv.ListEvents(ctx, &iri.ListEventsRequest{})
 
 		Expect(err).NotTo(HaveOccurred())
 
-		Expect(resp.MachineEvents).To(ConsistOf(SatisfyAll(
-			HaveField("InvolvedObjectMeta.Id", Equal(ironcoreMachine.Name)),
-			HaveField("Events", ConsistOf(SatisfyAll(
-				HaveField("Spec", SatisfyAll(
-					HaveField("Reason", Equal("testing")),
-					HaveField("Message", Equal("this is test event")),
-					HaveField("Type", Equal(corev1.EventTypeNormal)),
-				)),
-			))),
-		)))
+		Expect(resp.Events).To(ConsistOf(
+			HaveField("Spec", SatisfyAll(
+				HaveField("InvolvedObjectMeta.Id", Equal(ironcoreMachine.Name)),
+				HaveField("Reason", Equal("testing")),
+				HaveField("Message", Equal("this is test event")),
+				HaveField("Type", Equal(corev1.EventTypeNormal)),
+			)),
+		),
+		)
+
+		By("listing the machine events with matching label and time filters")
+		resp, err = srv.ListEvents(ctx, &iri.ListEventsRequest{Filter: &iri.EventFilter{
+			LabelSelector:  map[string]string{machinepoolletv1alpha1.MachineUIDLabel: "foobar"},
+			EventsFromTime: eventGeneratedTime.Unix(),
+			EventsToTime:   time.Now().Unix(),
+		}})
+
+		Expect(err).NotTo(HaveOccurred())
+
+		Expect(resp.Events).To(ConsistOf(
+			HaveField("Spec", SatisfyAll(
+				HaveField("InvolvedObjectMeta.Id", Equal(ironcoreMachine.Name)),
+				HaveField("Reason", Equal("testing")),
+				HaveField("Message", Equal("this is test event")),
+				HaveField("Type", Equal(corev1.EventTypeNormal)),
+			)),
+		),
+		)
+
+		By("listing the machine events with non matching label filter")
+		resp, err = srv.ListEvents(ctx, &iri.ListEventsRequest{Filter: &iri.EventFilter{
+			LabelSelector:  map[string]string{"foo": "bar"},
+			EventsFromTime: eventGeneratedTime.Unix(),
+			EventsToTime:   time.Now().Unix(),
+		}})
+		Expect(err).NotTo(HaveOccurred())
+
+		Expect(resp.Events).To(BeEmpty())
+
+		By("listing the machine events with matching label filter and non matching time filter")
+		resp, err = srv.ListEvents(ctx, &iri.ListEventsRequest{Filter: &iri.EventFilter{
+			LabelSelector:  map[string]string{machinepoolletv1alpha1.MachineUIDLabel: "foobar"},
+			EventsFromTime: eventGeneratedTime.Add(-10 * time.Minute).Unix(),
+			EventsToTime:   eventGeneratedTime.Add(-5 * time.Minute).Unix(),
+		}})
+		Expect(err).NotTo(HaveOccurred())
+
+		Expect(resp.Events).To(BeEmpty())
 	})
 })

hack/update-proto.sh

@@ -41,6 +41,7 @@ function generate() {
 }
 
 generate "iri/apis/meta/v1alpha1"
+generate "iri/apis/event/v1alpha1"
 generate "iri/apis/machine/v1alpha1"
 generate "iri/apis/volume/v1alpha1"
 generate "iri/apis/bucket/v1alpha1"