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

wire retry through #20

Merged
merged 2 commits into from
Apr 14, 2021
Merged

wire retry through #20

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad81852
wire retry through
vaikas Apr 14, 2021
259d6d7
mrege / cutpaset fixes
vaikas Apr 14, 2021
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
29 changes: 16 additions & 13 deletions test/rekt/features/broker/control_plane.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (

v1 "knative.dev/eventing/pkg/apis/duck/v1"
"knative.dev/reconciler-test/pkg/eventshub"
"knative.dev/reconciler-test/pkg/manifest"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
Expand Down Expand Up @@ -590,29 +591,31 @@ func createBrokerTriggerDeliveryTopology(f *feature.Feature, brokerName string,
// TODO: fix this crap
// With URI, or with retries, etc.
brokerOpts = append(brokerOpts, delivery.WithDeadLetterSink(prober.AsKReference("brokerdlq"), ""))
if brokerDS.Retry != nil {
brokerOpts = append(brokerOpts, delivery.WithRetry(*brokerDS.Retry, brokerDS.BackoffPolicy, brokerDS.BackoffDelay))
}
}
f.Setup("Create Broker", brokerresources.Install(brokerName, brokerOpts...))

prober.SetTargetResource(brokerresources.GVR(), brokerName)
t1Opts := []manifest.CfgFn{triggerresources.WithSubscriber(prober.AsKReference("t1"), "")}

if t1DS != nil {
f.Setup("Create Trigger1 with recorder", triggerresources.Install(feature.MakeRandomK8sName("t1"), brokerName,
triggerresources.WithSubscriber(prober.AsKReference("t1"), "")))
} else {
f.Setup("Create Trigger1 with recorder", triggerresources.Install(feature.MakeRandomK8sName("t1"), brokerName,
triggerresources.WithSubscriber(prober.AsKReference("t1"), ""),
delivery.WithDeadLetterSink(prober.AsKReference("t1dlq"), "")))
t1Opts = append(t1Opts, delivery.WithDeadLetterSink(prober.AsKReference("t1dlq"), ""))
if t1DS.Retry != nil {
t1Opts = append(t1Opts, delivery.WithRetry(*t1DS.Retry, t1DS.BackoffPolicy, t1DS.BackoffDelay))
}
}
f.Setup("Create Trigger1 with recorder", triggerresources.Install(feature.MakeRandomK8sName("t1"), brokerName, t1Opts...))

t2Opts := []manifest.CfgFn{triggerresources.WithSubscriber(prober.AsKReference("t2"), "")}
if t2DS != nil {
f.Setup("Create Trigger2 with recorder", triggerresources.Install(feature.MakeRandomK8sName("t2"), brokerName,
triggerresources.WithSubscriber(prober.AsKReference("t2"), "")))
} else {
f.Setup("Create Trigger2 with recorder", triggerresources.Install(feature.MakeRandomK8sName("t2"), brokerName,
triggerresources.WithSubscriber(prober.AsKReference("t2"), ""),
delivery.WithDeadLetterSink(prober.AsKReference("t2dlq"), "")))
t2Opts = append(t2Opts, delivery.WithDeadLetterSink(prober.AsKReference("t2dlq"), ""))
if t2DS.Retry != nil {
t2Opts = append(t2Opts, delivery.WithRetry(*t2DS.Retry, t2DS.BackoffPolicy, t2DS.BackoffDelay))
}
}

f.Setup("Create Trigger2 with recorder", triggerresources.Install(feature.MakeRandomK8sName("t2"), brokerName, t2Opts...))
return prober
}

Expand Down