fix: leader election config should be in the hubOpts of memberagent (#252)

zhiying-lin · web-flow · commit ec2a74e707f1 · 2022-08-29T09:05:05.000-07:00
diff --git a/cmd/memberagent/main.go b/cmd/memberagent/main.go
@@ -135,6 +135,7 @@ func main() {
 		LeaderElection:          *enableLeaderElection,
 		LeaderElectionNamespace: *leaderElectionNamespace,
 		LeaderElectionID:        "3111024923.hub.fleet.azure.com",
+		LeaderElectionConfig:    memberConfig,
 		Namespace:               mcNamespace,
 	}
 
@@ -145,7 +146,6 @@ func main() {
 		HealthProbeBindAddress:  *probeAddr,
 		LeaderElection:          hubOpts.LeaderElection,
 		LeaderElectionNamespace: *leaderElectionNamespace,
-		LeaderElectionConfig:    memberConfig,
 		LeaderElectionID:        "136224848560.member.fleet.azure.com",
 	}
 	//+kubebuilder:scaffold:builder

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,7 @@ func main() {`
`135`	`135`	`LeaderElection: *enableLeaderElection,`
`136`	`136`	`LeaderElectionNamespace: *leaderElectionNamespace,`
`137`	`137`	`LeaderElectionID: "3111024923.hub.fleet.azure.com",`
	`138`	`+ LeaderElectionConfig: memberConfig,`
`138`	`139`	`Namespace: mcNamespace,`
`139`	`140`	`}`
`140`	`141`
`@@ -145,7 +146,6 @@ func main() {`
`145`	`146`	`HealthProbeBindAddress: *probeAddr,`
`146`	`147`	`LeaderElection: hubOpts.LeaderElection,`
`147`	`148`	`LeaderElectionNamespace: *leaderElectionNamespace,`
`148`		`- LeaderElectionConfig: memberConfig,`
`149`	`149`	`LeaderElectionID: "136224848560.member.fleet.azure.com",`
`150`	`150`	`}`
`151`	`151`	`//+kubebuilder:scaffold:builder`