@@ -19,10 +19,8 @@ package handler
19
19
import (
20
20
"context"
21
21
22
- "k8s.io/apimachinery/pkg/types"
23
22
"k8s.io/client-go/util/workqueue"
24
23
"sigs.k8s.io/controller-runtime/pkg/client"
25
- "sigs.k8s.io/controller-runtime/pkg/controller/priorityqueue"
26
24
"sigs.k8s.io/controller-runtime/pkg/event"
27
25
"sigs.k8s.io/controller-runtime/pkg/reconcile"
28
26
)
@@ -48,7 +46,7 @@ type TypedMapFunc[object any, request comparable] func(context.Context, object)
48
46
// For UpdateEvents which contain both a new and old object, the transformation function is run on both
49
47
// objects and both sets of Requests are enqueue.
50
48
func EnqueueRequestsFromMapFunc (fn MapFunc ) EventHandler {
51
- return WithLowPriorityWhenUnchanged ( TypedEnqueueRequestsFromMapFunc (fn ) )
49
+ return TypedEnqueueRequestsFromMapFunc (fn )
52
50
}
53
51
54
52
// TypedEnqueueRequestsFromMapFunc enqueues Requests by running a transformation function that outputs a collection
@@ -82,23 +80,8 @@ func (e *enqueueRequestsFromMapFunc[object, request]) Create(
82
80
evt event.TypedCreateEvent [object ],
83
81
q workqueue.TypedRateLimitingInterface [request ],
84
82
) {
85
- wq , ok := q .(workqueue.TypedRateLimitingInterface [reconcile.Request ])
86
- if ok {
87
- evnt , ok := any (e ).(event.TypedCreateEvent [client.Object ])
88
- if ok {
89
- priorityQueue , isPriorityQueue := wq .(priorityqueue.PriorityQueue [reconcile.Request ])
90
- if isPriorityQueue {
91
- item := reconcile.Request {NamespacedName : types.NamespacedName {
92
- Name : evnt .Object .GetName (),
93
- Namespace : evnt .Object .GetNamespace (),
94
- }}
95
- addToQueueCreate (priorityQueue , evnt , item )
96
- return
97
- }
98
- reqs := map [request ]empty {}
99
- e .mapAndEnqueue (ctx , q , evt .Object , reqs )
100
- }
101
- }
83
+ reqs := map [request ]empty {}
84
+ e .mapAndEnqueue (ctx , q , evt .Object , reqs )
102
85
}
103
86
104
87
// Update implements EventHandler.
@@ -107,40 +90,6 @@ func (e *enqueueRequestsFromMapFunc[object, request]) Update(
107
90
evt event.TypedUpdateEvent [object ],
108
91
q workqueue.TypedRateLimitingInterface [request ],
109
92
) {
110
- wq , ok := q .(workqueue.TypedRateLimitingInterface [reconcile.Request ])
111
- if ok {
112
- evnt , ok := any (e ).(event.TypedUpdateEvent [client.Object ])
113
- if ok {
114
- switch {
115
- case ! isNil (evt .ObjectNew ):
116
- priorityQueue , isPriorityQueue := wq .(priorityqueue.PriorityQueue [reconcile.Request ])
117
- if isPriorityQueue {
118
- item := reconcile.Request {NamespacedName : types.NamespacedName {
119
- Name : evnt .ObjectNew .GetName (),
120
- Namespace : evnt .ObjectNew .GetNamespace (),
121
- }}
122
- addToQueueUpdate (priorityQueue , evnt , item )
123
- return
124
- }
125
- reqs := map [request ]empty {}
126
- e .mapAndEnqueue (ctx , q , evt .ObjectNew , reqs )
127
- case ! isNil (evt .ObjectOld ):
128
- priorityQueue , isPriorityQueue := wq .(priorityqueue.PriorityQueue [reconcile.Request ])
129
- if isPriorityQueue {
130
- item := reconcile.Request {NamespacedName : types.NamespacedName {
131
- Name : evnt .ObjectOld .GetName (),
132
- Namespace : evnt .ObjectOld .GetNamespace (),
133
- }}
134
- addToQueueUpdate (priorityQueue , evnt , item )
135
- return
136
- }
137
- reqs := map [request ]empty {}
138
- e .mapAndEnqueue (ctx , q , evt .ObjectOld , reqs )
139
- default :
140
- enqueueLog .Error (nil , "UpdateEvent received with no metadata" , "event" , evt )
141
- }
142
- }
143
- }
144
93
reqs := map [request ]empty {}
145
94
e .mapAndEnqueue (ctx , q , evt .ObjectOld , reqs )
146
95
e .mapAndEnqueue (ctx , q , evt .ObjectNew , reqs )
0 commit comments