Avoid nilref when copying leader election options from custom config

tomasaschan · tomasaschan · commit d5a6c49a512b · 2022-05-06T10:59:51.000+02:00
diff --git a/pkg/manager/manager.go b/pkg/manager/manager.go
@@ -494,6 +494,11 @@ func (o Options) AndFromOrDie(loader config.ControllerManagerConfiguration) Opti
 }
 
 func (o Options) setLeaderElectionConfig(obj v1alpha1.ControllerManagerConfigurationSpec) Options {
+	if obj.LeaderElection == nil {
+		// The source does not have any configuration; noop
+		return o
+	}
+
 	if !o.LeaderElection && obj.LeaderElection.LeaderElect != nil {
 		o.LeaderElection = *obj.LeaderElection.LeaderElect
 	}

Original file line number	Diff line number	Diff line change
`@@ -494,6 +494,11 @@ func (o Options) AndFromOrDie(loader config.ControllerManagerConfiguration) Opti`
`494`	`494`	`}`
`495`	`495`
`496`	`496`	`func (o Options) setLeaderElectionConfig(obj v1alpha1.ControllerManagerConfigurationSpec) Options {`
	`497`	`+ if obj.LeaderElection == nil {`
	`498`	`+ // The source does not have any configuration; noop`
	`499`	`+ return o`
	`500`	`+ }`
	`501`	`+`
`497`	`502`	`if !o.LeaderElection && obj.LeaderElection.LeaderElect != nil {`
`498`	`503`	`o.LeaderElection = *obj.LeaderElection.LeaderElect`
`499`	`504`	`}`