fix event creation

Signed-off-by: Joe McGuire <[email protected]>

Signed-off-by: Joe McGuire <[email protected]>

Author: jmcguire98

internal/kgateway/agentgatewaysyncer/nack/publisher.go

@@ -44,7 +44,7 @@ func (p *Publisher) OnNack(event krtxds.NackEvent) {
 	k8sEvent := &corev1.Event{
 		ObjectMeta: metav1.ObjectMeta{
 			GenerateName: "agentgateway-nack-",
-			Namespace:    p.systemNamespace,
+			Namespace:    event.Gateway.Namespace,
 			Annotations: map[string]string{
 				AnnotationNackID:     nackID,
 				AnnotationTypeURL:    event.TypeUrl,
@@ -69,7 +69,7 @@ func (p *Publisher) OnNack(event krtxds.NackEvent) {
 		ReportingController: wellknown.DefaultAgwControllerName,
 	}
 
-	_, err := p.client.Kube().CoreV1().Events(p.systemNamespace).Create(
+	_, err := p.client.Kube().CoreV1().Events(event.Gateway.Namespace).Create(
 		p.ctx, k8sEvent, metav1.CreateOptions{},
 	)
 	if err != nil && !errors.IsAlreadyExists(err) {
@@ -91,7 +91,7 @@ func (p *Publisher) OnAck(event krtxds.AckEvent) {
 	k8sEvent := &corev1.Event{
 		ObjectMeta: metav1.ObjectMeta{
 			GenerateName: "agentgateway-ack-",
-			Namespace:    p.systemNamespace,
+			Namespace:    event.Gateway.Namespace,
 			Annotations: map[string]string{
 				AnnotationNackID:     ComputeNackID(event.Gateway.Namespace+"/"+event.Gateway.Name, event.TypeUrl),
 				AnnotationTypeURL:    event.TypeUrl,
@@ -114,7 +114,7 @@ func (p *Publisher) OnAck(event krtxds.AckEvent) {
 		ReportingController: wellknown.DefaultAgwControllerName,
 	}
 
-	_, err := p.client.Kube().CoreV1().Events(p.systemNamespace).Create(
+	_, err := p.client.Kube().CoreV1().Events(event.Gateway.Namespace).Create(
 		p.ctx, k8sEvent, metav1.CreateOptions{},
 	)
 	if err != nil && !errors.IsAlreadyExists(err) {

pkg/agentgateway/plugins/collection.go

@@ -2,6 +2,7 @@ package plugins
 
 import (
 	"context"
+	"fmt"
 
 	"istio.io/istio/pkg/config/schema/gvk"
 	"istio.io/istio/pkg/config/schema/gvr"
@@ -22,6 +23,7 @@ import (
 	gwxv1a1 "sigs.k8s.io/gateway-api/apisx/v1alpha1"
 
 	"github.com/kgateway-dev/kgateway/v2/api/v1alpha1"
+	"github.com/kgateway-dev/kgateway/v2/internal/kgateway/agentgatewaysyncer/nack"
 	"github.com/kgateway-dev/kgateway/v2/internal/kgateway/krtcollections"
 	"github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown"
 	kgwversioned "github.com/kgateway-dev/kgateway/v2/pkg/client/clientset/versioned"
@@ -316,11 +318,10 @@ func NewAgwCollections(
 		EndpointSlices: krt.WrapClient(
 			kclient.NewFiltered[*discovery.EndpointSlice](commoncol.Client, kubetypes.Filter{ObjectFilter: commoncol.Client.ObjectFilter()}),
 			commoncol.KrtOpts.ToOptions("informer/EndpointSlices")...),
-		// we only want to watch events in the system namespace (that we control) to avoid performance issues.
-		// todo: we could probably tighten this further with a field selector for the involved object being of kind Gateway. (overkill/)
+		// we only want to watch events that we created (AgentgatewayNACK/AgentgatewayACK) to avoid performance issues.
 		Events: krt.WrapClient(
 			kclient.NewFiltered[*corev1.Event](commoncol.Client, kubetypes.Filter{
-				Namespace: systemNamespace,
+				FieldSelector: fmt.Sprintf("reason=%s,reason=%s", nack.ReasonNack, nack.ReasonAck),
 			}),
 			commoncol.KrtOpts.ToOptions("informer/Events")...),