feat: remove new-trigger-filters feature flag (#8067)

Signed-off-by: Calum Murray <[email protected]>
knative · Jul 16, 2024 · 2cc0a5b · 2cc0a5b
1 parent 1316277
commit 2cc0a5b
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 25 deletions.
diff --git a/config/core/configmaps/features.yaml b/config/core/configmaps/features.yaml
@@ -39,11 +39,6 @@ data:
   # For more details: https://github.com/knative/eventing/issues/5593
   kreference-mapping: "disabled"
 
-  # BETA feature: The new-trigger-filters flag allows you to use the new `filters` field
-  # in Trigger objects with its rich filtering capabilities.
-  # For more details: https://github.com/knative/eventing/issues/5204
-  new-trigger-filters: "enabled"
-
   # BETA feature: The transport-encryption flag allows you to encrypt events in transit using the transport layer security (TLS) protocol.
   # For more details: https://github.com/knative/eventing/issues/5957
   transport-encryption: "disabled"

diff --git a/pkg/apis/eventing/v1/trigger_validation.go b/pkg/apis/eventing/v1/trigger_validation.go
@@ -186,7 +186,7 @@ func ValidateAttributesNames(attrs map[string]string) (errs *apis.FieldError) {
 }
 
 func ValidateSubscriptionAPIFiltersList(ctx context.Context, filters []SubscriptionsAPIFilter) (errs *apis.FieldError) {
-	if filters == nil || !feature.FromContext(ctx).IsEnabled(feature.NewTriggerFilters) {
+	if filters == nil {
 		return nil
 	}
 

diff --git a/pkg/apis/eventing/v1/trigger_validation_test.go b/pkg/apis/eventing/v1/trigger_validation_test.go
@@ -692,9 +692,6 @@ func TestTriggerSpecValidationWithCrossNamespaceEventLinksFeatureEnabled(t *test
 }
 
 func TestFilterSpecValidation(t *testing.T) {
-	newTriggerFiltersEnabledCtx := feature.ToContext(context.TODO(), feature.Flags{
-		feature.NewTriggerFilters: feature.Enabled,
-	})
 	tests := []struct {
 		name    string
 		filter  *TriggerFilter
@@ -939,7 +936,7 @@ func TestFilterSpecValidation(t *testing.T) {
 				Filters:    test.filters,
 				Subscriber: validSubscriber,
 			}
-			got := ts.Validate(newTriggerFiltersEnabledCtx)
+			got := ts.Validate(context.Background())
 			if diff := cmp.Diff(test.want.Error(), got.Error()); diff != "" {
 				t.Errorf("Validate TriggerSpec (-want, +got) =\n%s", diff)
 			}

diff --git a/pkg/apis/feature/features.go b/pkg/apis/feature/features.go
@@ -76,7 +76,6 @@ func newDefaults() Flags {
 		DeliveryRetryAfter:       Disabled,
 		DeliveryTimeout:          Enabled,
 		KReferenceMapping:        Disabled,
-		NewTriggerFilters:        Enabled,
 		TransportEncryption:      Disabled,
 		OIDCAuthentication:       Disabled,
 		EvenTypeAutoCreate:       Disabled,

diff --git a/pkg/apis/feature/features_test.go b/pkg/apis/feature/features_test.go
@@ -71,7 +71,4 @@ func TestShouldNotOverrideDefaults(t *testing.T) {
 	if !f.IsDisabled(KReferenceGroup) && !f.IsEnabled(KReferenceGroup) {
 		t.Errorf("Expected default value for %s in flags %+v", KReferenceGroup, f)
 	}
-	if !f.IsEnabled(NewTriggerFilters) {
-		t.Errorf("Expected default value for %s to be %s in flags %+v", NewTriggerFilters, Enabled, f)
-	}
 }
diff --git a/pkg/apis/feature/flag_names.go b/pkg/apis/feature/flag_names.go
@@ -21,7 +21,6 @@ const (
 	DeliveryRetryAfter       = "delivery-retryafter"
 	DeliveryTimeout          = "delivery-timeout"
 	KReferenceMapping        = "kreference-mapping"
-	NewTriggerFilters        = "new-trigger-filters"
 	TransportEncryption      = "transport-encryption"
 	EvenTypeAutoCreate       = "eventtype-auto-create"
 	OIDCAuthentication       = "authentication-oidc"

diff --git a/pkg/broker/filter/filter_handler.go b/pkg/broker/filter/filter_handler.go
@@ -563,7 +563,7 @@ func (h *Handler) getTrigger(ref path.NamespacedNameUID) (*eventingv1.Trigger, e
 
 func (h *Handler) filterEvent(ctx context.Context, trigger *eventingv1.Trigger, event cloudevents.Event) eventfilter.FilterResult {
 	switch {
-	case feature.FromContext(ctx).IsEnabled(feature.NewTriggerFilters) && len(trigger.Spec.Filters) > 0:
+	case len(trigger.Spec.Filters) > 0:
 		logging.FromContext(ctx).Debugw("New trigger filters feature is enabled. Applying new filters.", zap.Any("filters", trigger.Spec.Filters))
 		filter, ok := h.filtersMap.Get(trigger)
 		if !ok {

diff --git a/pkg/broker/filter/filter_handler_test.go b/pkg/broker/filter/filter_handler_test.go
@@ -672,9 +672,7 @@ func TestReceiver_WithSubscriptionsAPI(t *testing.T) {
 				reporter,
 				configmapinformer.Get(ctx).Lister().ConfigMaps("ns"),
 				func(ctx context.Context) context.Context {
-					return feature.ToContext(context.TODO(), feature.Flags{
-						feature.NewTriggerFilters: feature.Enabled,
-					})
+					return ctx
 				})
 			if err != nil {
 				t.Fatal("Unable to create receiver:", err)

diff --git a/test/config/config-features.yaml b/test/config/config-features.yaml
@@ -35,11 +35,6 @@ data:
   # For more details: https://github.com/knative/eventing/issues/5593
   kreference-mapping: "disabled"
 
-  # BETA feature: The new-trigger-filters flag allows you to use the new `filters` field
-  # in Trigger objects with its rich filtering capabilities.
-  # For more details: https://github.com/knative/eventing/issues/5204
-  new-trigger-filters: "enabled"
-
   # ALPHA feature: The transport-encryption flag allows you to encrypt events in transit using the transport layer security (TLS) protocol.
   # For more details: https://github.com/knative/eventing/issues/5957
   transport-encryption: "disabled"

diff --git a/test/experimental/config/features.yaml b/test/experimental/config/features.yaml
@@ -24,5 +24,4 @@ data:
   kreference-group: "enabled"
   delivery-retryafter: "enabled"
   delivery-timeout: "enabled"
-  new-trigger-filters: "enabled"
   eventtype-auto-create: "enabled"