Skip to content

Commit

Permalink
fix(fix-deps): added error checking; fixed deprecation in .golangci.yml
Browse files Browse the repository at this point in the history
Signed-off-by: Craig Newton <newtondev@gmail.com>
  • Loading branch information
newtondev authored and grzesuav committed Mar 26, 2024
1 parent 35bbdac commit 361ad96
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .golangci.yaml
@@ -1,8 +1,8 @@
run:
skip-dirs:
issues:
exclude-dirs:
- pkg/client/generated
- examples

linters-settings:
exhaustive:
default-signifies-exhaustive: true
default-signifies-exhaustive: true
6 changes: 5 additions & 1 deletion pkg/controller/common/customize/manager.go
Expand Up @@ -169,12 +169,16 @@ func (rm *Manager) getRelatedClient(apiVersion, resource string) (*dynamicclient
return nil, nil, fmt.Errorf("can't create informer for related resource: %w", err)
}

informer.Informer().AddEventHandler(clientgo_cache.ResourceEventHandlerFuncs{
_, err := informer.Informer().AddEventHandler(clientgo_cache.ResourceEventHandlerFuncs{
AddFunc: rm.onRelatedAdd,
UpdateFunc: rm.onRelatedUpdate,
DeleteFunc: rm.onRelatedDelete,
})

if err != nil {
return nil, nil, fmt.Errorf("can't create informer for related resource: %w", err)
}

if !clientgo_cache.WaitForNamedCacheSync(rm.name, rm.stopCh, informer.Informer().HasSynced) {
rm.logger.Info("related Manager - cache sync never finished", "name", rm.name)
}
Expand Down
15 changes: 12 additions & 3 deletions pkg/controller/composite/controller.go
Expand Up @@ -232,16 +232,25 @@ func (pc *parentController) Start() {
if resyncPeriod < time.Second {
resyncPeriod = time.Second
}
pc.parentInformer.Informer().AddEventHandlerWithResyncPeriod(parentHandlers, resyncPeriod)
_, err := pc.parentInformer.Informer().AddEventHandlerWithResyncPeriod(parentHandlers, resyncPeriod)
if err != nil {
pc.logger.Error(err, "Unable to AddEventHandlerWithResyncPeriod Informer to Parent Informer", "controller", pc.cc.Name)
}
} else {
pc.parentInformer.Informer().AddEventHandler(parentHandlers)
_, err := pc.parentInformer.Informer().AddEventHandler(parentHandlers)
if err != nil {
pc.logger.Error(err, "Unable to AddEventHandler Informer to Parent Informer", "controller", pc.cc.Name)
}
}
for _, childInformer := range pc.childInformers {
childInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
_, err := childInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
AddFunc: pc.onChildAdd,
UpdateFunc: pc.onChildUpdate,
DeleteFunc: pc.onChildDelete,
})
if err != nil {
pc.logger.Error(err, "Unable to AddEventHandler Informer to Child Informer", "controller", pc.cc.Name)
}
}

go func() {
Expand Down
15 changes: 12 additions & 3 deletions pkg/controller/decorator/controller.go
Expand Up @@ -223,17 +223,26 @@ func (c *decoratorController) Start() {
}
for _, informer := range c.parentInformers {
if resyncPeriod != 0 {
informer.Informer().AddEventHandlerWithResyncPeriod(parentHandlers, resyncPeriod)
_, err := informer.Informer().AddEventHandlerWithResyncPeriod(parentHandlers, resyncPeriod)
if err != nil {
c.logger.Error(err, "Unable to AddEventHandlerWithResyncPeriod Parent Informer to Informer", "controller", c.dc.Name)
}
} else {
informer.Informer().AddEventHandler(parentHandlers)
_, err := informer.Informer().AddEventHandler(parentHandlers)
if err != nil {
c.logger.Error(err, "Unable to AddEventHandler Parent Informer to Informer", "controller", c.dc.Name)
}
}
}
for _, informer := range c.childInformers {
informer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
_, err := informer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
AddFunc: c.onChildAdd,
UpdateFunc: c.onChildUpdate,
DeleteFunc: c.onChildDelete,
})
if err != nil {
c.logger.Error(err, "Unable to AddEventHandler Child Informer to Informer", "controller", c.dc.Name)
}
}

go func() {
Expand Down

0 comments on commit 361ad96

Please sign in to comment.