fix: event syncer

loft-sh · Jul 23, 2024 · 2563272 · 2563272
1 parent 8f287e2
commit 2563272
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/pkg/controllers/resources/events/syncer.go b/pkg/controllers/resources/events/syncer.go
@@ -59,7 +59,6 @@ func (s *eventSyncer) Sync(ctx *synccontext.SyncContext, pObj client.Object, vOb
 	if err != nil {
 		return ctrl.Result{}, fmt.Errorf("new syncer patcher: %w", err)
 	}
-
 	defer func() {
 		if err := patch.Patch(ctx, pEvent, vEvent); err != nil {
 			retErr = utilerrors.NewAggregate([]error{retErr, err})

diff --git a/pkg/controllers/resources/events/translate.go b/pkg/controllers/resources/events/translate.go
@@ -13,7 +13,7 @@ func (s *eventSyncer) translateEvent(ctx *synccontext.SyncContext, pEvent, vEven
 	// retrieve involved object
 	involvedObject, err := resources.GetInvolvedObject(ctx, pEvent)
 	if err != nil {
-		return nil
+		return err
 	}
 	tempEvent := pEvent.DeepCopy()
 
@@ -25,7 +25,7 @@ func (s *eventSyncer) translateEvent(ctx *synccontext.SyncContext, pEvent, vEven
 
 	// rewrite name
 	namespace := involvedObject.GetNamespace()
-	name := hostEventNameToVirtual(vEvent.Name, pEvent.InvolvedObject.Name, vEvent.InvolvedObject.Name)
+	name := hostEventNameToVirtual(pEvent.Name, pEvent.InvolvedObject.Name, involvedObject.GetName())
 
 	// we replace namespace/name & name in messages so that it seems correct
 	tempEvent.Message = strings.ReplaceAll(tempEvent.Message, pEvent.InvolvedObject.Namespace+"/"+pEvent.InvolvedObject.Name, tempEvent.InvolvedObject.Namespace+"/"+tempEvent.InvolvedObject.Name)