Skip to content
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

Jump to bottom

🏃 Pass a stripped down object to controller.Watch #2576

Merged
merged 1 commit into from
Mar 6, 2020
Merged

🏃 Pass a stripped down object to controller.Watch #2576

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions controllers/external/tracker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (

"github.com/go-logr/logr"
"github.com/pkg/errors"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/handler"
Expand All @@ -41,20 +42,23 @@ func (o *ObjectTracker) Watch(log logr.Logger, obj runtime.Object, handler handl
return nil
}

gk := obj.GetObjectKind().GroupVersionKind().GroupKind()
_, loaded := o.m.LoadOrStore(gk.String(), struct{}{})
gvk := obj.GetObjectKind().GroupVersionKind()
_, loaded := o.m.LoadOrStore(gvk.GroupKind().String(), struct{}{})
if loaded {
return nil
}

log.Info("Adding watcher on external object", "GroupKind", gk.String())
u := &unstructured.Unstructured{}
u.SetGroupVersionKind(gvk)

log.Info("Adding watcher on external object", "GroupVersionKind", gvk.String())
err := o.Controller.Watch(
&source.Kind{Type: obj},
&source.Kind{Type: u},
handler,
)
if err != nil {
o.m.Delete(obj)
return errors.Wrapf(err, "failed to add watcher on external object %q", gk.String())
return errors.Wrapf(err, "failed to add watcher on external object %q", gvk.String())
}
return nil
}