Skip to content

chore: small refactor of dynamic controller funcs #774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

chore: small refactor of dynamic controller funcs #774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e82090
refactor: rename gvr_watch to lazy_informer for clarity in naming
jakobmoellerdev Nov 6, 2025
e9e8727
refactor: improve error handling and type usage in DynamicController
jakobmoellerdev Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions pkg/dynamiccontroller/dynamic_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ func (dc *DynamicController) syncFunc(ctx context.Context, oi ObjectIdentifiers,
return err
}

func (dc *DynamicController) enqueueParent(parentGVR schema.GroupVersionResource, obj interface{}, eventType string) {
func (dc *DynamicController) enqueueParent(parentGVR schema.GroupVersionResource, obj any, eventType string) {
mobj, err := meta.Accessor(obj)
if err != nil {
dc.log.Error(err, "Failed to get meta for object to enqueue", "eventType", eventType)
Expand All @@ -341,7 +341,7 @@ func (dc *DynamicController) enqueueParent(parentGVR schema.GroupVersionResource
dc.queue.Add(oi)
}

func (dc *DynamicController) updateFunc(parentGVR schema.GroupVersionResource, oldObj, newObj interface{}) {
func (dc *DynamicController) updateFunc(parentGVR schema.GroupVersionResource, oldObj, newObj any) {
newMeta, err := meta.Accessor(newObj)
if err != nil {
dc.log.Error(err, "failed to access new object meta")
Expand Down Expand Up @@ -529,7 +529,12 @@ func (dc *DynamicController) reconcileChildrenLocked(
}
w := dc.ensureWatchLocked(child)
childHandlerID := childHandlerID(parent, child)
if err := w.AddHandler(dc.ctx, childHandlerID, dc.handlerForChildGVR(parent, child)); err != nil {
childHandler, err := dc.handlerForChildGVR(parent, child)
if err != nil {
return fmt.Errorf("creating child handler for %s for parent %s failed: %w", child, parent, err)
}

if err := w.AddHandler(dc.ctx, childHandlerID, childHandler); err != nil {
return fmt.Errorf("add child handler %s: %w", child, err)
}
reg.childHandlerIDs[child] = childHandlerID
Expand Down Expand Up @@ -562,8 +567,12 @@ func (dc *DynamicController) removeHandlerLocked(gvr schema.GroupVersionResource
return nil
}

func (dc *DynamicController) handlerForChildGVR(parent, child schema.GroupVersionResource) cache.ResourceEventHandler {
func (dc *DynamicController) handlerForChildGVR(parent, child schema.GroupVersionResource) (cache.ResourceEventHandler, error) {
parentGVRKey, childGVRKey := keyFromGVR(parent), keyFromGVR(child)
parentGVK, err := dc.mapper.KindFor(parent)
if err != nil {
return nil, fmt.Errorf("failed ot get parent gvk from %s for child handler: %w", parentGVRKey, err)
}
handle := func(obj interface{}, eventType string) {
objMeta, err := meta.Accessor(obj)
if err != nil {
Expand All @@ -584,11 +593,6 @@ func (dc *DynamicController) handlerForChildGVR(parent, child schema.GroupVersio
return
}

parentGVK, err := dc.mapper.KindFor(parent)
if err != nil {
dc.log.Error(err, "failed to get parent GVK", "parent", parentGVRKey)
return
}
pom := &metav1.PartialObjectMetadata{}
pom.SetGroupVersionKind(parentGVK)
pom.SetName(name)
Expand All @@ -609,7 +613,7 @@ func (dc *DynamicController) handlerForChildGVR(parent, child schema.GroupVersio
AddFunc: func(obj interface{}) { handle(obj, eventTypeAdd) },
UpdateFunc: func(oldObj, newObj interface{}) { handle(newObj, eventTypeUpdate) },
DeleteFunc: func(obj interface{}) { handle(obj, eventTypeDelete) },
}
}, nil
}

func (dc *DynamicController) gracefulShutdown() error {
Expand Down
0 pkg/dynamiccontroller/internal/gvr_watch.go → ...namiccontroller/internal/lazy_informer.go
View file
Open in desktop
File renamed without changes.
0 ...amiccontroller/internal/gvr_watch_test.go → ...controller/internal/lazy_informer_test.go
View file
Open in desktop
File renamed without changes.