Skip to content

Commit 6d18229

Browse files
author
Evsyukov Denis
committed
refactor: introduce RangeValue method for varyingInformers to simplify range operations
Signed-off-by: Evsyukov Denis <denis.evsyukov@flant.com>
1 parent 0c351b0 commit 6d18229

1 file changed

Lines changed: 13 additions & 8 deletions

File tree

pkg/kube_events_manager/monitor.go

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,15 @@ func (v *varyingInformers) Range(f func(key string, value []*resourceInformer) b
8282
})
8383
}
8484

85+
func (v *varyingInformers) RangeValue(f func(value []*resourceInformer)) {
86+
v.value.Range(func(_, value any) bool {
87+
if value, ok := value.([]*resourceInformer); ok {
88+
f(value)
89+
}
90+
return true
91+
})
92+
}
93+
8594
func (v *varyingInformers) Delete(key string) {
8695
v.value.Delete(key)
8796
}
@@ -270,11 +279,10 @@ func (m *monitor) Snapshot() []kemtypes.ObjectAndFilterResult {
270279
objects = append(objects, informer.getCachedObjects()...)
271280
}
272281

273-
m.VaryingInformers.Range(func(_ string, value []*resourceInformer) bool {
282+
m.VaryingInformers.RangeValue(func(value []*resourceInformer) {
274283
for _, informer := range value {
275284
objects = append(objects, informer.getCachedObjects()...)
276285
}
277-
return true
278286
})
279287

280288
// Sort objects by namespace and name
@@ -290,11 +298,10 @@ func (m *monitor) EnableKubeEventCb() {
290298
informer.enableKubeEventCb()
291299
}
292300
// Execute eventCb for events accumulated during "Synchronization" phase.
293-
m.VaryingInformers.Range(func(_ string, value []*resourceInformer) bool {
301+
m.VaryingInformers.RangeValue(func(value []*resourceInformer) {
294302
for _, informer := range value {
295303
informer.enableKubeEventCb()
296304
}
297-
return true
298305
})
299306
// Enable events for future VaryingInformers.
300307
m.eventsEnabled = true
@@ -373,11 +380,10 @@ func (m *monitor) PauseHandleEvents() {
373380
informer.pauseHandleEvents()
374381
}
375382

376-
m.VaryingInformers.Range(func(_ string, value []*resourceInformer) bool {
383+
m.VaryingInformers.RangeValue(func(value []*resourceInformer) {
377384
for _, informer := range value {
378385
informer.pauseHandleEvents()
379386
}
380-
return true
381387
})
382388

383389
if m.NamespaceInformer != nil {
@@ -394,12 +400,11 @@ func (m *monitor) SnapshotOperations() (*CachedObjectsInfo /*total*/, *CachedObj
394400
last.add(informer.getCachedObjectsInfoIncrement())
395401
}
396402

397-
m.VaryingInformers.Range(func(_ string, value []*resourceInformer) bool {
403+
m.VaryingInformers.RangeValue(func(value []*resourceInformer) {
398404
for _, informer := range value {
399405
total.add(informer.getCachedObjectsInfo())
400406
last.add(informer.getCachedObjectsInfoIncrement())
401407
}
402-
return true
403408
})
404409

405410
return total, last

0 commit comments

Comments
 (0)