Skip to content

Commit 5972c55

Browse files
committed
drop unnecessary code, use informer fork
1 parent a479832 commit 5972c55

File tree

4 files changed

+46
-268
lines changed

4 files changed

+46
-268
lines changed

pkg/kcp/controller.go

Lines changed: 0 additions & 153 deletions
This file was deleted.

pkg/kcp/informers.go

Lines changed: 46 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,8 @@ func (s *sharedIndexInformer) Run(stopCh <-chan struct{}) {
195195
s.startedLock.Lock()
196196
defer s.startedLock.Unlock()
197197

198-
s.controller = New(cfg)
199-
// TODO(KCP)
200-
s.controller.(*controller).clock = s.clock
198+
s.controller = cache.New(cfg)
199+
201200
s.started = true
202201
}()
203202

@@ -627,3 +626,47 @@ func (p *processorListener) setResyncPeriod(resyncPeriod time.Duration) {
627626

628627
p.resyncPeriod = resyncPeriod
629628
}
629+
630+
// Multiplexes updates in the form of a list of Deltas into a Store, and informs
631+
// a given handler of events OnUpdate, OnAdd, OnDelete
632+
// taken from k8s.io/client-go/tools/cache/controller.go
633+
func processDeltas(
634+
// Object which receives event notifications from the given deltas
635+
handler cache.ResourceEventHandler,
636+
clientState cache.Store,
637+
transformer cache.TransformFunc,
638+
deltas cache.Deltas,
639+
) error {
640+
// from oldest to newest
641+
for _, d := range deltas {
642+
obj := d.Object
643+
if transformer != nil {
644+
var err error
645+
obj, err = transformer(obj)
646+
if err != nil {
647+
return err
648+
}
649+
}
650+
651+
switch d.Type {
652+
case cache.Sync, cache.Replaced, cache.Added, cache.Updated:
653+
if old, exists, err := clientState.Get(obj); err == nil && exists {
654+
if err := clientState.Update(obj); err != nil {
655+
return err
656+
}
657+
handler.OnUpdate(old, obj)
658+
} else {
659+
if err := clientState.Add(obj); err != nil {
660+
return err
661+
}
662+
handler.OnAdd(obj)
663+
}
664+
case cache.Deleted:
665+
if err := clientState.Delete(obj); err != nil {
666+
return err
667+
}
668+
handler.OnDelete(obj)
669+
}
670+
}
671+
return nil
672+
}

pkg/kcp/informers_hack.go

Lines changed: 0 additions & 111 deletions
This file was deleted.

pkg/kcp/wrappers.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ func NewClusterAwareManager(cfg *rest.Config, options ctrl.Options) (manager.Man
5757
func NewClusterAwareCache(config *rest.Config, opts cache.Options) (cache.Cache, error) {
5858
c := rest.CopyConfig(config)
5959
c.Host += "/clusters/*"
60-
// opts.NewInformerFunc = NewClusterAwareSharedIndexInformerFunc(kcpcache.ClusterAwareKeyFunc)
6160
opts.NewInformerFunc = NewSharedIndexInformer
6261

6362
opts.Indexers = k8scache.Indexers{

0 commit comments

Comments
 (0)