Skip to content

✨ expose NewResourceLock in manager.Options #535

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

Closed
wants to merge 3 commits into from
Closed

✨ expose NewResourceLock in manager.Options #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7e6a8c
expose NewResourceLock in manager.Options so controllers can use cust…
jzhoucliqr Jul 24, 2019
fcf02cf
minor doc
jzhoucliqr Jul 29, 2019
50efb85
retrigger test
jzhoucliqr Jul 29, 2019
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
13 changes: 8 additions & 5 deletions pkg/manager/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,13 @@ type Options struct {
// use the cache for reads and the client for writes.
NewClient NewClientFunc

// NewResourceLock is the function to create a resourceLock
// Manager can use customized resourcelock for leader selection
// If not privided, will use ConfigMapsResourceLock as default
NewResourceLock func(config *rest.Config, recorderProvider recorder.Provider, options leaderelection.Options) (resourcelock.Interface, error)

// Dependency injection for testing
newRecorderProvider func(config *rest.Config, scheme *runtime.Scheme, logger logr.Logger) (recorder.Provider, error)
newResourceLock func(config *rest.Config, recorderProvider recorder.Provider, options leaderelection.Options) (resourcelock.Interface, error)
newMetricsListener func(addr string) (net.Listener, error)
}

Expand Down Expand Up @@ -237,7 +241,7 @@ func New(config *rest.Config, options Options) (Manager, error) {
}

// Create the resource lock to enable leader election)
resourceLock, err := options.newResourceLock(config, recorderProvider, leaderelection.Options{
resourceLock, err := options.NewResourceLock(config, recorderProvider, leaderelection.Options{
LeaderElection: options.LeaderElection,
LeaderElectionID: options.LeaderElectionID,
LeaderElectionNamespace: options.LeaderElectionNamespace,
Expand Down Expand Up @@ -321,9 +325,8 @@ func setOptionsDefaults(options Options) Options {
options.newRecorderProvider = internalrecorder.NewProvider
}

// Allow newResourceLock to be mocked
if options.newResourceLock == nil {
options.newResourceLock = leaderelection.NewResourceLock
if options.NewResourceLock == nil {
options.NewResourceLock = leaderelection.NewResourceLock
}

if options.newMetricsListener == nil {
Expand Down
4 changes: 2 additions & 2 deletions pkg/manager/manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ var _ = Describe("manger.Manager", func() {
m, err := New(cfg, Options{
LeaderElection: true,
LeaderElectionNamespace: "default",
newResourceLock: func(config *rest.Config, recorderProvider recorder.Provider, options leaderelection.Options) (resourcelock.Interface, error) {
NewResourceLock: func(config *rest.Config, recorderProvider recorder.Provider, options leaderelection.Options) (resourcelock.Interface, error) {
var err error
rl, err = leaderelection.NewResourceLock(config, recorderProvider, options)
return rl, err
Expand Down Expand Up @@ -299,7 +299,7 @@ var _ = Describe("manger.Manager", func() {
LeaderElection: true,
LeaderElectionID: "controller-runtime",
LeaderElectionNamespace: "default",
newResourceLock: fakeleaderelection.NewResourceLock,
NewResourceLock: fakeleaderelection.NewResourceLock,
})
})

Expand Down