From 6d82cc8c30d7f2d190a1096a309817a1342b729d Mon Sep 17 00:00:00 2001 From: Pierangelo Di Pilato Date: Mon, 16 Sep 2024 15:54:01 +0200 Subject: [PATCH] Remove e2e test dependency on injection informers Signed-off-by: Pierangelo Di Pilato --- control-plane/pkg/reconciler/trigger/v2/triggerv2.go | 5 ----- test/rekt/features/broker_deleted_recreated.go | 8 ++++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/control-plane/pkg/reconciler/trigger/v2/triggerv2.go b/control-plane/pkg/reconciler/trigger/v2/triggerv2.go index d933b17d64..3f9875a5c0 100644 --- a/control-plane/pkg/reconciler/trigger/v2/triggerv2.go +++ b/control-plane/pkg/reconciler/trigger/v2/triggerv2.go @@ -55,11 +55,6 @@ import ( const ( deliveryOrderAnnotation = "kafka.eventing.knative.dev/delivery.order" - // TopicPrefix is the Kafka Broker topic prefix - (topic name: knative-broker--). - TopicPrefix = "knative-broker-" - - // ExternalTopicAnnotation for using external kafka topic for the broker - ExternalTopicAnnotation = "kafka.eventing.knative.dev/external.topic" ) type Reconciler struct { diff --git a/test/rekt/features/broker_deleted_recreated.go b/test/rekt/features/broker_deleted_recreated.go index 4a1f52ab91..07d070b076 100644 --- a/test/rekt/features/broker_deleted_recreated.go +++ b/test/rekt/features/broker_deleted_recreated.go @@ -18,7 +18,7 @@ package features import ( "k8s.io/apimachinery/pkg/types" - kafkabroker "knative.dev/eventing-kafka-broker/control-plane/pkg/reconciler/broker" + "knative.dev/eventing-kafka-broker/test/e2e_new/bogus_config" "knative.dev/eventing-kafka-broker/test/rekt/resources/kafkatopic" @@ -111,7 +111,7 @@ func BrokerAuthSecretDoesNotExist() *feature.Feature { broker.WithConfig(configName), broker.WithAnnotations( map[string]interface{}{ - kafkabroker.ExternalTopicAnnotation: topicName, + "kafka.eventing.knative.dev/external.topic": topicName, }))...)) f.Assert("delete broker", featuressteps.DeleteBroker(brokerName)) @@ -132,7 +132,7 @@ func BrokerExternalTopicDoesNotExist() *feature.Feature { broker.WithEnvConfig(), broker.WithAnnotations( map[string]interface{}{ - kafkabroker.ExternalTopicAnnotation: topicName, + "kafka.eventing.knative.dev/external.topic": topicName, }))...)) f.Assert("delete broker", featuressteps.DeleteBroker(brokerName)) @@ -161,7 +161,7 @@ func BrokerExternalTopicAuthSecretDoesNotExist() *feature.Feature { broker.WithConfig(configName), broker.WithAnnotations( map[string]interface{}{ - kafkabroker.ExternalTopicAnnotation: topicName, + "kafka.eventing.knative.dev/external.topic": topicName, }))...)) f.Assert("delete broker", featuressteps.DeleteBroker(brokerName))