moved feature flag prerequisite

knative · May 23, 2024 · 911471b · 911471b
1 parent 2d6913c
commit 911471b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/test/rekt/crossnamespace_test.go b/test/rekt/crossnamespace_test.go
@@ -25,7 +25,6 @@ import (
 	"knative.dev/reconciler-test/pkg/knative"
 
 	"knative.dev/eventing/test/rekt/features/broker"
-	"knative.dev/eventing/test/rekt/features/featureflags"
 	"knative.dev/eventing/test/rekt/features/trigger"
 )
 
@@ -54,9 +53,6 @@ func TestBrokerTriggerCrossNamespaceReference(t *testing.T) {
 		environment.Managed(t),
 	)
 
-	triggerEnv.Prerequisite("Cross Namespace Event Links is enabled", featureflags.CrossEventLinksEnabled())
-	brokerEnv.Prerequisite("Cross Namespace Event Links is enabled", featureflags.CrossEventLinksEnabled())
-
 	brokerEnv.Test(brokerEnvCtx, t, broker.GoesReadyInDifferentNamespace(brokerName, brokerNamespace))
 	brokerEnv.Test(brokerEnvCtx, t, broker.TriggerGoesReady(triggerName, brokerName))
 	triggerEnv.Test(triggerEnvCtx, t, trigger.CrossNamespaceEventLinks(brokerEnvCtx, brokerNamespace, brokerName, triggerNamespace, triggerName))

diff --git a/test/rekt/features/broker/crossnamespace.go b/test/rekt/features/broker/crossnamespace.go
@@ -19,13 +19,15 @@ package broker
 import (
 	"fmt"
 
+	"knative.dev/eventing/test/rekt/features/featureflags"
 	"knative.dev/eventing/test/rekt/resources/broker"
 	"knative.dev/reconciler-test/pkg/feature"
 	"knative.dev/reconciler-test/pkg/manifest"
 )
 
 func GoesReadyInDifferentNamespace(name, namespace string, cfg ...manifest.CfgFn) *feature.Feature {
 	f := new(feature.Feature)
+	f.Prerequisite("Cross Namespace Event Links is enabled", featureflags.CrossEventLinksEnabled())
 
 	// Add the namespace configuration
 	namespaceCfg := broker.WithConfigNamespace(namespace)

diff --git a/test/rekt/features/trigger/crossnamespace.go b/test/rekt/features/trigger/crossnamespace.go
@@ -27,12 +27,15 @@ import (
 
 	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"
 )
 
 func CrossNamespaceEventLinks(ctx context.Context, brokerNamespace, brokerName, triggerNamespace, triggerName string) *feature.Feature {
 	f := feature.NewFeature()
 
+	f.Prerequisite("Cross Namespace Event Links is enabled", featureflags.CrossEventLinksEnabled())
+
 	sourceName := feature.MakeRandomK8sName("source")
 	subscriberName := feature.MakeRandomK8sName("subscriber")