Skip to content

Commit

Permalink
Set default Interceptor.Kind for EventListener TriggerGroups
Browse files Browse the repository at this point in the history
Fixes #1499

While `Kind` is getting defaulted properly for interceptors in `EventListener.Spec.Triggers`, it also needs to be defaulted for interceptors in `EventListener.Spec.TriggerGroups`.

Signed-off-by: Andrew Bayer <andrew.bayer@gmail.com>
  • Loading branch information
abayer authored and tekton-robot committed Jan 13, 2023
1 parent e599f8e commit 6527564
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 0 deletions.
8 changes: 8 additions & 0 deletions pkg/apis/triggers/v1beta1/event_listener_defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,13 @@ func (el *EventListener) SetDefaults(ctx context.Context) {
}
}
}

for _, tg := range el.Spec.TriggerGroups {
for _, ti := range tg.Interceptors {
if ti != nil {
ti.defaultInterceptorKind()
}
}
}
}
}
27 changes: 27 additions & 0 deletions pkg/apis/triggers/v1beta1/event_listener_defaults_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,33 @@ func TestEventListenerSetDefaults(t *testing.T) {
})
return contexts.WithUpgradeViaDefaulting(s.ToContext(ctx))
},
}, {
name: "adds TriggerGroup interceptorkind when not specified",
in: &v1beta1.EventListener{
Spec: v1beta1.EventListenerSpec{
TriggerGroups: []v1beta1.EventListenerTriggerGroup{{
Interceptors: []*v1beta1.EventInterceptor{{
Ref: v1beta1.InterceptorRef{
Name: "cel",
},
}},
}},
},
},
wc: contexts.WithUpgradeViaDefaulting,
want: &v1beta1.EventListener{
Spec: v1beta1.EventListenerSpec{
ServiceAccountName: config.DefaultServiceAccountValue,
TriggerGroups: []v1beta1.EventListenerTriggerGroup{{
Interceptors: []*v1beta1.EventInterceptor{{
Ref: v1beta1.InterceptorRef{
Name: "cel",
Kind: v1beta1.ClusterInterceptorKind,
},
}},
}},
},
},
}}
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
Expand Down

0 comments on commit 6527564

Please # to comment.