Skip to content

Fix missing parameter in hook watch #235

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

Merged
merged 4 commits into from
Sep 12, 2023
Merged

Fix missing parameter in hook watch #235

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62bb751
fix missing parameter
Sep 4, 2023
928dd25
Fix missing 1.20 to 1.21 upgrade
Sep 5, 2023
60789ae
Hold on pointer
juldrixx Sep 6, 2023
4fa17a2
Revert go upgrade
juldrixx Sep 11, 2023
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
6 changes: 4 additions & 2 deletions pkg/reconciler/internal/hook/hook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ func NewDependentResourceWatcher(c controller.Controller, rm meta.RESTMapper, ca
return &dependentResourceWatcher{
controller: c,
restMapper: rm,
cache: cache,
scheme: scheme,
m: sync.Mutex{},
watches: make(map[schema.GroupVersionKind]struct{}),
}
Expand All @@ -52,7 +54,7 @@ type dependentResourceWatcher struct {
controller controller.Controller
restMapper meta.RESTMapper
cache cache.Cache
scheme runtime.Scheme
scheme *runtime.Scheme

m sync.Mutex
watches map[schema.GroupVersionKind]struct{}
Expand Down Expand Up @@ -96,7 +98,7 @@ func (d *dependentResourceWatcher) Exec(owner *unstructured.Unstructured, rel re
}

if useOwnerRef && !manifestutil.HasResourcePolicyKeep(unstructuredObj.GetAnnotations()) { // Setup watch using owner references.
if err := d.controller.Watch(source.Kind(d.cache, unstructuredObj), handler.EnqueueRequestForOwner(&d.scheme, d.restMapper, owner, handler.OnlyControllerOwner()), dependentPredicate); err != nil {
if err := d.controller.Watch(source.Kind(d.cache, unstructuredObj), handler.EnqueueRequestForOwner(d.scheme, d.restMapper, owner, handler.OnlyControllerOwner()), dependentPredicate); err != nil {
return err
}
} else { // Setup watch using annotations.
Expand Down