fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change leader election ID to be more descriptive 

This changes the leader election ID to be more descriptive, while it is
a breaking change the impact should be minimal assuming people have not
scaled up their replica count.

Signed-off-by: Hidde Beydals <hello@hidde.co>
This commit is contained in:
Hidde Beydals 2021-03-26 12:14:59 +01:00
parent eaec1642cc
commit 647f4ec80d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main.go
View File

@ -47,6 +47,8 @@ import (
// +kubebuilder:scaffold:imports // +kubebuilder:scaffold:imports
) )
const controllerName = "source-controller"
var ( var (
scheme = runtime.NewScheme() scheme = runtime.NewScheme()
setupLog = ctrl.Log.WithName("setup") setupLog = ctrl.Log.WithName("setup")
@ -103,7 +105,7 @@ func main() {
var eventRecorder *events.Recorder var eventRecorder *events.Recorder
if eventsAddr != "" { if eventsAddr != "" {
if er, err := events.NewRecorder(eventsAddr, "source-controller"); err != nil { if er, err := events.NewRecorder(eventsAddr, controllerName); err != nil {
setupLog.Error(err, "unable to create event recorder") setupLog.Error(err, "unable to create event recorder")
os.Exit(1) os.Exit(1)
} else { } else {
@ -130,7 +132,7 @@ func main() {
LeaseDuration: &leaderElectionOptions.LeaseDuration, LeaseDuration: &leaderElectionOptions.LeaseDuration,
RenewDeadline: &leaderElectionOptions.RenewDeadline, RenewDeadline: &leaderElectionOptions.RenewDeadline,
RetryPeriod: &leaderElectionOptions.RetryPeriod, RetryPeriod: &leaderElectionOptions.RetryPeriod,
LeaderElectionID: "305740c0.fluxcd.io", LeaderElectionID: fmt.Sprintf("%s-leader-election", controllerName),
Namespace: watchNamespace, Namespace: watchNamespace,
Logger: ctrl.Log, Logger: ctrl.Log,
}) })
@ -151,7 +153,7 @@ func main() {
Client: mgr.GetClient(), Client: mgr.GetClient(),
Scheme: mgr.GetScheme(), Scheme: mgr.GetScheme(),
Storage: storage, Storage: storage,
EventRecorder: mgr.GetEventRecorderFor("source-controller"), EventRecorder: mgr.GetEventRecorderFor(controllerName),
ExternalEventRecorder: eventRecorder, ExternalEventRecorder: eventRecorder,
MetricsRecorder: metricsRecorder, MetricsRecorder: metricsRecorder,
}).SetupWithManagerAndOptions(mgr, controllers.GitRepositoryReconcilerOptions{ }).SetupWithManagerAndOptions(mgr, controllers.GitRepositoryReconcilerOptions{
@ -165,7 +167,7 @@ func main() {
Scheme: mgr.GetScheme(), Scheme: mgr.GetScheme(),
Storage: storage, Storage: storage,
Getters: getters, Getters: getters,
EventRecorder: mgr.GetEventRecorderFor("source-controller"), EventRecorder: mgr.GetEventRecorderFor(controllerName),
ExternalEventRecorder: eventRecorder, ExternalEventRecorder: eventRecorder,
MetricsRecorder: metricsRecorder, MetricsRecorder: metricsRecorder,
}).SetupWithManagerAndOptions(mgr, controllers.HelmRepositoryReconcilerOptions{ }).SetupWithManagerAndOptions(mgr, controllers.HelmRepositoryReconcilerOptions{
@ -179,7 +181,7 @@ func main() {
Scheme: mgr.GetScheme(), Scheme: mgr.GetScheme(),
Storage: storage, Storage: storage,
Getters: getters, Getters: getters,
EventRecorder: mgr.GetEventRecorderFor("source-controller"), EventRecorder: mgr.GetEventRecorderFor(controllerName),
ExternalEventRecorder: eventRecorder, ExternalEventRecorder: eventRecorder,
MetricsRecorder: metricsRecorder, MetricsRecorder: metricsRecorder,
}).SetupWithManagerAndOptions(mgr, controllers.HelmChartReconcilerOptions{ }).SetupWithManagerAndOptions(mgr, controllers.HelmChartReconcilerOptions{
@ -192,7 +194,7 @@ func main() {
Client: mgr.GetClient(), Client: mgr.GetClient(),
Scheme: mgr.GetScheme(), Scheme: mgr.GetScheme(),
Storage: storage, Storage: storage,
EventRecorder: mgr.GetEventRecorderFor("source-controller"), EventRecorder: mgr.GetEventRecorderFor(controllerName),
ExternalEventRecorder: eventRecorder, ExternalEventRecorder: eventRecorder,
MetricsRecorder: metricsRecorder, MetricsRecorder: metricsRecorder,
}).SetupWithManagerAndOptions(mgr, controllers.BucketReconcilerOptions{ }).SetupWithManagerAndOptions(mgr, controllers.BucketReconcilerOptions{