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

🐛 Avoid nilref when copying leader election options from custom config #1889

Merged
merged 2 commits into from
May 11, 2022
Merged

🐛 Avoid nilref when copying leader election options from custom config #1889

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5a6c49
Avoid nilref when copying leader election options from custom config
tomasaschan May 6, 2022
598027b
Add regression test
tomasaschan May 10, 2022
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
5 changes: 5 additions & 0 deletions pkg/manager/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,11 @@ func (o Options) AndFromOrDie(loader config.ControllerManagerConfiguration) Opti
}

func (o Options) setLeaderElectionConfig(obj v1alpha1.ControllerManagerConfigurationSpec) Options {
if obj.LeaderElection == nil {
tomasaschan marked this conversation as resolved.
Show resolved Hide resolved
tomasaschan marked this conversation as resolved.
Show resolved Hide resolved
// The source does not have any configuration; noop
return o
}

if !o.LeaderElection && obj.LeaderElection.LeaderElect != nil {
o.LeaderElection = *obj.LeaderElection.LeaderElect
}
Expand Down