Skip to content

CrossNamespace: Data Plane Changes for Broker Filter #7913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knative-prow merged 4 commits into from
May 17, 2024
Merged

CrossNamespace: Data Plane Changes for Broker Filter #7913

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
49aa6bc
data plane changes
yijie-04 May 10, 2024
9a4b65f
Merge branch 'main' of https://github.com/knative/eventing into broke…
yijie-04 May 17, 2024
ba4d1e5
moved global variables inside function
yijie-04 May 17, 2024
d164904
updated other functions
yijie-04 May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 29 additions & 4 deletions pkg/broker/filter/filter_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,16 @@ func (h *Handler) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
}

func (h *Handler) handleDispatchToReplyRequest(ctx context.Context, trigger *eventingv1.Trigger, writer http.ResponseWriter, request *http.Request, event *event.Event) {
broker, err := h.brokerLister.Brokers(trigger.Namespace).Get(trigger.Spec.Broker)
var brokerRef, brokerNamespace string
if feature.FromContext(ctx).IsEnabled(feature.CrossNamespaceEventLinks) && trigger.Spec.BrokerRef.Namespace != "" {
brokerRef = trigger.Spec.BrokerRef.Name
brokerNamespace = trigger.Spec.BrokerRef.Namespace
} else {
brokerRef = trigger.Spec.Broker
brokerNamespace = trigger.Namespace
}

broker, err := h.brokerLister.Brokers(brokerNamespace).Get(brokerRef)
if err != nil {
h.logger.Info("Unable to get the Broker", zap.Error(err))
writer.WriteHeader(http.StatusBadRequest)
Expand All @@ -239,7 +248,7 @@ func (h *Handler) handleDispatchToReplyRequest(ctx context.Context, trigger *eve
reportArgs := &ReportArgs{
ns: trigger.Namespace,
trigger: trigger.Name,
broker: trigger.Spec.Broker,
broker: brokerRef,
requestType: "reply_forward",
}

Expand All @@ -256,7 +265,16 @@ func (h *Handler) handleDispatchToReplyRequest(ctx context.Context, trigger *eve
}

func (h *Handler) handleDispatchToDLSRequest(ctx context.Context, trigger *eventingv1.Trigger, writer http.ResponseWriter, request *http.Request, event *event.Event) {
broker, err := h.brokerLister.Brokers(trigger.Namespace).Get(trigger.Spec.Broker)
var brokerRef, brokerNamespace string
if feature.FromContext(ctx).IsEnabled(feature.CrossNamespaceEventLinks) && trigger.Spec.BrokerRef.Namespace != "" {
brokerRef = trigger.Spec.BrokerRef.Name
brokerNamespace = trigger.Spec.BrokerRef.Namespace
} else {
brokerRef = trigger.Spec.Broker
brokerNamespace = trigger.Namespace
}

broker, err := h.brokerLister.Brokers(brokerNamespace).Get(brokerRef)
if err != nil {
h.logger.Info("Unable to get the Broker", zap.Error(err))
writer.WriteHeader(http.StatusBadRequest)
Expand Down Expand Up @@ -298,6 +316,13 @@ func (h *Handler) handleDispatchToDLSRequest(ctx context.Context, trigger *event
}

func (h *Handler) handleDispatchToSubscriberRequest(ctx context.Context, trigger *eventingv1.Trigger, writer http.ResponseWriter, request *http.Request, event *event.Event) {
var brokerRef string
if feature.FromContext(ctx).IsEnabled(feature.CrossNamespaceEventLinks) && trigger.Spec.BrokerRef.Namespace != "" {
brokerRef = trigger.Spec.BrokerRef.Name
} else {
brokerRef = trigger.Spec.Broker
}

triggerRef := types.NamespacedName{
Name: trigger.Name,
Namespace: trigger.Namespace,
Expand All @@ -321,7 +346,7 @@ func (h *Handler) handleDispatchToSubscriberRequest(ctx context.Context, trigger
reportArgs := &ReportArgs{
ns: trigger.Namespace,
trigger: trigger.Name,
broker: trigger.Spec.Broker,
broker: brokerRef,
filterType: triggerFilterAttribute(trigger.Spec.Filter, "type"),
requestType: "filter",
}
Expand Down