github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #125154 from alvaroaleman/rename

Browse Source 
Sample Controller: Use one variable for key throughout
This commit is contained in:
Kubernetes Prow Robot
2024-06-04 12:53:25 -07:00
committed by GitHub
parent 7e88a33c7b 6e2e7f7c26
commit a080057dab
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
staging/src/k8s.io/sample-controller/controller.go
View File

@@ -204,27 +204,27 @@ func (c *Controller) processNextWorkItem(ctx context.Context) bool {
} }
// We wrap this block in a func so we can defer c.workqueue.Done. // We wrap this block in a func so we can defer c.workqueue.Done.
err := func(key string) error { err := func() error {
// We call Done here so the workqueue knows we have finished // We call Done here so the workqueue knows we have finished
// processing this item. We also must remember to call Forget if we // processing this item. We also must remember to call Forget if we
// do not want this work item being re-queued. For example, we do // do not want this work item being re-queued. For example, we do
// not call Forget if a transient error occurs, instead the item is // not call Forget if a transient error occurs, instead the item is
// put back on the workqueue and attempted again after a back-off // put back on the workqueue and attempted again after a back-off
// period. // period.
defer c.workqueue.Done(key) defer c.workqueue.Done(obj)
// Run the syncHandler, passing it the namespace/name string of the // Run the syncHandler, passing it the namespace/name string of the
// Foo resource to be synced. // Foo resource to be synced.
if err := c.syncHandler(ctx, key); err != nil { if err := c.syncHandler(ctx, obj); err != nil {
// Put the item back on the workqueue to handle any transient errors. // Put the item back on the workqueue to handle any transient errors.
c.workqueue.AddRateLimited(key) c.workqueue.AddRateLimited(obj)
return fmt.Errorf("error syncing '%s': %s, requeuing", key, err.Error()) return fmt.Errorf("error syncing '%s': %s, requeuing", obj, err.Error())
} }
// Finally, if no error occurs we Forget this item so it does not // Finally, if no error occurs we Forget this item so it does not
// get queued again until another change happens. // get queued again until another change happens.
c.workqueue.Forget(obj) c.workqueue.Forget(obj)
logger.Info("Successfully synced", "resourceName", key) logger.Info("Successfully synced", "resourceName", obj)
return nil return nil
}(obj) }()
if err != nil { if err != nil {
utilruntime.HandleError(err) utilruntime.HandleError(err)