Skip to content

fix: add more event filter across controllers #2449

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
ronething merged 4 commits into from
Jul 4, 2025
Merged

fix: add more event filter across controllers #2449

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a48752
fix: ApisixRoute controller watch annotation change
ronething Jul 3, 2025
dccbd09
fix: r
ronething Jul 3, 2025
6b9f5ea
fix: r
ronething Jul 3, 2025
5658cd3
fix: r
ronething Jul 4, 2025
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
4 changes: 4 additions & 0 deletions internal/controller/apisixconsumer_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,10 @@ func (r *ApisixConsumerReconciler) SetupWithManager(mgr ctrl.Manager) error {
predicate.Or(
predicate.GenerationChangedPredicate{},
predicate.AnnotationChangedPredicate{},
predicate.NewPredicateFuncs(func(obj client.Object) bool {
_, ok := obj.(*corev1.Secret)
return ok
}),
),
).
Watches(
Expand Down
4 changes: 3 additions & 1 deletion internal/controller/apisixroute_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,15 @@ func (r *ApisixRouteReconciler) SetupWithManager(mgr ctrl.Manager) error {
WithEventFilter(
predicate.Or(
predicate.GenerationChangedPredicate{},
predicate.AnnotationChangedPredicate{},
predicate.NewPredicateFuncs(func(obj client.Object) bool {
_, ok := obj.(*corev1.Secret)
return ok
}),
),
).
Watches(&networkingv1.IngressClass{},
Watches(
&networkingv1.IngressClass{},
handler.EnqueueRequestsFromMapFunc(r.listApisixRouteForIngressClass),
builder.WithPredicates(
predicate.NewPredicateFuncs(matchesIngressController),
Expand Down
4 changes: 4 additions & 0 deletions internal/controller/apisixtls_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ func (r *ApisixTlsReconciler) SetupWithManager(mgr ctrl.Manager) error {
predicate.Or(
predicate.GenerationChangedPredicate{},
predicate.AnnotationChangedPredicate{},
predicate.NewPredicateFuncs(func(obj client.Object) bool {
_, ok := obj.(*corev1.Secret)
return ok
}),
),
).
Watches(
Expand Down
0 ...nal/controller/gatewayclass_congroller.go → ...nal/controller/gatewayclass_controller.go
View file
Open in desktop
File renamed without changes.
10 changes: 10 additions & 0 deletions internal/controller/gatewayproxy_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"

Expand All @@ -51,6 +52,15 @@ type GatewayProxyController struct {
func (r *GatewayProxyController) SetupWithManager(mrg ctrl.Manager) error {
return ctrl.NewControllerManagedBy(mrg).
For(&v1alpha1.GatewayProxy{}).
WithEventFilter(
predicate.Or(
predicate.GenerationChangedPredicate{},
predicate.NewPredicateFuncs(func(obj client.Object) bool {
_, ok := obj.(*corev1.Secret)
return ok
}),
),
).
Watches(&corev1.Service{},
handler.EnqueueRequestsFromMapFunc(r.listGatewayProxiesForProviderService),
).
Expand Down
4 changes: 4 additions & 0 deletions internal/controller/ingress_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ func (r *IngressReconciler) SetupWithManager(mgr ctrl.Manager) error {
predicate.Or(
predicate.GenerationChangedPredicate{},
predicate.AnnotationChangedPredicate{},
predicate.NewPredicateFuncs(func(obj client.Object) bool {
_, ok := obj.(*corev1.Secret)
return ok
}),
),
).
Watches(
Expand Down
1 change: 1 addition & 0 deletions internal/controller/ingressclass_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ func (r *IngressClassReconciler) SetupWithManager(mgr ctrl.Manager) error {
WithEventFilter(
predicate.Or(
predicate.GenerationChangedPredicate{},
predicate.AnnotationChangedPredicate{},
predicate.NewPredicateFuncs(func(obj client.Object) bool {
_, ok := obj.(*corev1.Secret)
return ok
Expand Down
Loading