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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

馃悰 controllers without For() fail to start #2105

Merged
merged 2 commits into from Dec 19, 2022
Merged

馃悰 controllers without For() fail to start #2105

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
daf890e
馃悰 controllers without For() fail to start
tsuzu Dec 18, 2022
9599511
Add a test for Builder without For
tsuzu Dec 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 11 additions & 9 deletions pkg/builder/controller.go
View file
Open in desktop
Expand Up @@ -216,15 +216,17 @@ func (blder *Builder) project(obj client.Object, proj objectProjection) (client.

func (blder *Builder) doWatch() error {
// Reconcile type
typeForSrc, err := blder.project(blder.forInput.object, blder.forInput.objectProjection)
if err != nil {
return err
}
src := &source.Kind{Type: typeForSrc}
hdler := &handler.EnqueueRequestForObject{}
allPredicates := append(blder.globalPredicates, blder.forInput.predicates...)
if err := blder.ctrl.Watch(src, hdler, allPredicates...); err != nil {
return err
if blder.forInput.object != nil {
typeForSrc, err := blder.project(blder.forInput.object, blder.forInput.objectProjection)
if err != nil {
return err
}
src := &source.Kind{Type: typeForSrc}
hdler := &handler.EnqueueRequestForObject{}
allPredicates := append(blder.globalPredicates, blder.forInput.predicates...)
if err := blder.ctrl.Watch(src, hdler, allPredicates...); err != nil {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a test for this, for example by checking how often ctrl.Watch gets called

Copy link
Contributor Author

@tsuzu tsuzu Dec 19, 2022 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding a fake controller.Controller is difficult for me.
Instead, I added a test with doReconcileTest.

return err
}
}

// Watches the managed types
Expand Down
17 changes: 17 additions & 0 deletions pkg/builder/controller_test.go
View file
Open in desktop
Expand Up @@ -376,6 +376,23 @@ var _ = Describe("application", func() {
defer cancel()
doReconcileTest(ctx, "4", m, true, bldr)
})

It("should Reconcile without For", func() {
m, err := manager.New(cfg, manager.Options{})
Expect(err).NotTo(HaveOccurred())

bldr := ControllerManagedBy(m).
Named("Deployment").
Watches( // Equivalent of For
&source.Kind{Type: &appsv1.Deployment{}}, &handler.EnqueueRequestForObject{}).
Watches( // Equivalent of Owns
&source.Kind{Type: &appsv1.ReplicaSet{}},
&handler.EnqueueRequestForOwner{OwnerType: &appsv1.Deployment{}, IsController: true})

ctx, cancel := context.WithCancel(context.Background())
defer cancel()
doReconcileTest(ctx, "9", m, true, bldr)
})
})

Describe("Set custom predicates", func() {
Expand Down