Skip to content
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

Jump to bottom

[WIP]: feat: triggerv2 supports cross namespace references #4060

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[WIP]: feat: triggerv2 supports cross namespace references #4060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions control-plane/pkg/reconciler/trigger/v2/controllerv2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
// Filter Brokers and enqueue associated Triggers
brokerInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{
FilterFunc: kafka.BrokerClassFilter(),
Handler: enqueueTriggers(logger, triggerLister, impl.Enqueue),
Handler: enqueueTriggers(logger, triggerLister, impl.Enqueue, coreFeatureStore),
})

// ConsumerGroup changes and enqueue associated Trigger
Expand Down Expand Up @@ -198,21 +198,29 @@
func enqueueTriggers(
logger *zap.Logger,
lister eventinglisters.TriggerLister,
enqueue func(obj interface{})) cache.ResourceEventHandler {
enqueue func(obj interface{}),
featureStore *feature.Store) cache.ResourceEventHandler {

return controller.HandleAll(func(obj interface{}) {

if broker, ok := obj.(*eventing.Broker); ok {
features := featureStore.Load()

Check warning on line 207 in control-plane/pkg/reconciler/trigger/v2/controllerv2.go

View check run for this annotation

Codecov / codecov/patch

control-plane/pkg/reconciler/trigger/v2/controllerv2.go#L207 

Added line #L207 was not covered by tests

selector := labels.SelectorFromSet(map[string]string{apiseventing.BrokerLabelKey: broker.Name})
triggers, err := lister.Triggers(broker.Namespace).List(selector)
triggers, err := lister.Triggers(metav1.NamespaceAll).List(selector)

Check warning on line 210 in control-plane/pkg/reconciler/trigger/v2/controllerv2.go

View check run for this annotation

Codecov / codecov/patch

control-plane/pkg/reconciler/trigger/v2/controllerv2.go#L210 

Added line #L210 was not covered by tests
if err != nil {
logger.Warn("Failed to list triggers", zap.Any("broker", broker), zap.Error(err))
return
}

for _, trigger := range triggers {
enqueue(trigger)
if features.IsCrossNamespaceEventLinks() {
if trigger.Spec.BrokerRef != nil && trigger.Spec.BrokerRef.Namespace == broker.Namespace {
enqueue(trigger)

Check warning on line 219 in control-plane/pkg/reconciler/trigger/v2/controllerv2.go

View check run for this annotation

Codecov / codecov/patch

control-plane/pkg/reconciler/trigger/v2/controllerv2.go#L217-L219 

Added lines #L217 - L219 were not covered by tests
}
} else if trigger.Namespace == broker.Namespace {
enqueue(trigger)

Check warning on line 222 in control-plane/pkg/reconciler/trigger/v2/controllerv2.go

View check run for this annotation

Codecov / codecov/patch

control-plane/pkg/reconciler/trigger/v2/controllerv2.go#L221-L222 

Added lines #L221 - L222 were not covered by tests
}
}
}
})
Expand Down
13 changes: 11 additions & 2 deletions control-plane/pkg/reconciler/trigger/v2/triggerv2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,16 @@
return fmt.Errorf("failed to setup OIDC service account: %w", err)
}

broker, err := r.BrokerLister.Brokers(trigger.Namespace).Get(trigger.Spec.Broker)
var brokerName, brokerNamespace string
if trigger.Spec.BrokerRef != nil && feature.FromContext(ctx).IsCrossNamespaceEventLinks() {
brokerName = trigger.Spec.BrokerRef.Name
brokerNamespace = trigger.Spec.BrokerRef.Namespace

Check warning on line 100 in control-plane/pkg/reconciler/trigger/v2/triggerv2.go

View check run for this annotation

Codecov / codecov/patch

control-plane/pkg/reconciler/trigger/v2/triggerv2.go#L99-L100 

Added lines #L99 - L100 were not covered by tests
} else {
brokerName = trigger.Spec.Broker
brokerNamespace = trigger.Namespace
}

broker, err := r.BrokerLister.Brokers(brokerNamespace).Get(brokerName)
if err != nil && !apierrors.IsNotFound(err) {
trigger.Status.MarkBrokerFailed("Failed to get broker", "%v", err)
return fmt.Errorf("failed to get broker: %w", err)
Expand All @@ -104,7 +113,7 @@

// Actually check if the broker doesn't exist.
// Note: do not introduce another `broker` variable with `:`
broker, err = r.EventingClient.EventingV1().Brokers(trigger.Namespace).Get(ctx, trigger.Spec.Broker, metav1.GetOptions{})
broker, err = r.EventingClient.EventingV1().Brokers(brokerNamespace).Get(ctx, brokerName, metav1.GetOptions{})

if apierrors.IsNotFound(err) {
return fmt.Errorf("failed to get broker: %w", err)
Expand Down
Loading