Skip to content

🐛 Enable Logger Injection for Controller Manager #1072

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 1 commit into from
Jul 24, 2020
Merged

🐛 Enable Logger Injection for Controller Manager #1072

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions pkg/manager/internal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,9 @@ func (cm *controllerManager) SetFields(i interface{}) error {
if _, err := inject.MapperInto(cm.mapper, i); err != nil {
return err
}
if _, err := inject.LoggerInto(log, i); err != nil {
return err
}
return nil
}

Expand Down
14 changes: 14 additions & 0 deletions pkg/manager/manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1118,6 +1118,11 @@ var _ = Describe("manger.Manager", func() {
Expect(f).NotTo(BeNil())
return nil
},
log: func(logger logr.Logger) error {
defer GinkgoRecover()
Expect(logger).To(Equal(log))
return nil
},
})
Expect(err).NotTo(HaveOccurred())

Expand Down Expand Up @@ -1256,6 +1261,7 @@ var _ inject.Client = &injectable{}
var _ inject.Scheme = &injectable{}
var _ inject.Config = &injectable{}
var _ inject.Stoppable = &injectable{}
var _ inject.Logger = &injectable{}

type injectable struct {
scheme func(scheme *runtime.Scheme) error
Expand All @@ -1264,6 +1270,7 @@ type injectable struct {
cache func(cache.Cache) error
f func(inject.Func) error
stop func(<-chan struct{}) error
log func(logger logr.Logger) error
}

func (i *injectable) InjectCache(c cache.Cache) error {
Expand Down Expand Up @@ -1308,6 +1315,13 @@ func (i *injectable) InjectStopChannel(stop <-chan struct{}) error {
return i.stop(stop)
}

func (i *injectable) InjectLogger(log logr.Logger) error {
if i.log == nil {
return nil
}
return i.log(log)
}

func (i *injectable) Start(<-chan struct{}) error {
return nil
}
Expand Down