fix(test): the crossnamespace e2e test passes now (knative#1)

Signed-off-by: Calum Murray <cmurray@redhat.com>
Cali0707 · Jun 27, 2024 · a3a7c4a · a3a7c4a
1 parent 8c07a7a
commit a3a7c4a
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 3 deletions.
diff --git a/pkg/reconciler/broker/trigger/controller.go b/pkg/reconciler/broker/trigger/controller.go
@@ -163,6 +163,8 @@ func filterTriggers(featureStore *feature.Store, lister eventinglisters.BrokerLi
 			return false
 		}
 
+		var broker string
+		var brokerNamespace string
 		if featureStore.IsEnabled(feature.CrossNamespaceEventLinks) && trigger.Spec.BrokerRef != nil {
 			broker = trigger.Spec.BrokerRef.Name
 			brokerNamespace = trigger.Spec.BrokerRef.Namespace

diff --git a/pkg/reconciler/broker/trigger/trigger.go b/pkg/reconciler/broker/trigger/trigger.go
@@ -57,8 +57,6 @@ import (
 )
 
 var brokerGVK = eventingv1.SchemeGroupVersion.WithKind("Broker")
-var brokerNamespace string
-var broker string
 
 const (
 	// Name of the corev1.Events emitted from the Trigger reconciliation process.
@@ -91,6 +89,8 @@ type Reconciler struct {
 func (r *Reconciler) ReconcileKind(ctx context.Context, t *eventingv1.Trigger) pkgreconciler.Event {
 	logging.FromContext(ctx).Infow("Reconciling", zap.Any("Trigger", t))
 
+	var broker string
+	var brokerNamespace string
 	if t.Spec.BrokerRef != nil && feature.FromContext(ctx).IsEnabled(feature.CrossNamespaceEventLinks) {
 		broker = t.Spec.BrokerRef.Name
 		brokerNamespace = t.Spec.BrokerRef.Namespace

diff --git a/test/rekt/features/trigger/crossnamespace.go b/test/rekt/features/trigger/crossnamespace.go
@@ -20,6 +20,8 @@ import (
 	"context"
 
 	cetest "github.com/cloudevents/sdk-go/v2/test"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	eventingclient "knative.dev/eventing/pkg/client/injection/client"
 	"knative.dev/eventing/test/rekt/features/featureflags"
 	"knative.dev/eventing/test/rekt/resources/broker"
 	"knative.dev/eventing/test/rekt/resources/trigger"
@@ -62,9 +64,18 @@ func CrossNamespaceEventLinks(brokerEnvCtx context.Context) *feature.Feature {
 	f.Setup("install trigger", trigger.Install(triggerName, triggerCfg...))
 
 	f.Setup("install subscriber", eventshub.Install(subscriberName, eventshub.StartReceiver))
-	f.Setup("install event source", eventshub.Install(sourceName, eventshub.StartSenderToNamespacedResource(broker.GVR(), brokerName, brokerNamespace), eventshub.InputEvent(ev)))
+
+	// <resource>.IsReady uses the environment in the context to find the resource, hence we can only check the trigger
+	// However, the trigger being ready implies the broker is ready, so we are okay
+	f.Setup("trigger is ready", trigger.IsReady(triggerName))
+	f.Requirement("install event source", eventshub.Install(sourceName, eventshub.StartSenderToNamespacedResource(broker.GVR(), brokerName, brokerNamespace), eventshub.InputEvent(ev)))
 
 	f.Assert("event is received by subscriber", assert.OnStore(subscriberName).MatchEvent(cetest.HasId(ev.ID())).Exact(1))
 
+	f.Teardown("delete trigger", func(ctx context.Context, t feature.T) {
+		env := environment.FromContext(ctx)
+		eventingclient.Get(ctx).EventingV1().Triggers(env.Namespace()).Delete(ctx, triggerName, metav1.DeleteOptions{})
+	})
+
 	return f
 }
diff --git a/test/rekt/resources/trigger/trigger.go b/test/rekt/resources/trigger/trigger.go
@@ -179,6 +179,8 @@ func WithBrokerRef(ref *duckv1.KReference) manifest.CfgFn {
 			brokerRef["name"] = ref.Name
 			brokerRef["namespace"] = ref.Namespace
 		}
+
+		cfg["brokerRef"] = brokerRef
 	}
 }
 

diff --git a/test/rekt/resources/trigger/trigger.yaml b/test/rekt/resources/trigger/trigger.yaml
@@ -27,6 +27,13 @@ spec:
   {{ if .brokerName }}
   broker: {{ .brokerName }}
   {{ end }}
+  {{ if .brokerRef }}
+  brokerRef:
+    kind: {{ .brokerRef.kind }}
+    namespace: {{ .brokerRef.namespace }}
+    name: {{ .brokerRef.name }}
+    apiVersion: {{ .brokerRef.apiVersion }}
+  {{ end }}
   {{ if .filter }}
   filter:
     attributes: