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

Use new events and metrics helpers in main.go 

Signed-off-by: Sunny <darkowlzz@protonmail.com>
This commit is contained in:
Sunny 2021-11-24 22:30:20 +05:30 committed by Hidde Beydals
parent 9eb6833d4d
commit a1efbad15a
1 changed files with 28 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
main.go
View File

@ -33,13 +33,12 @@ import (
clientgoscheme "k8s.io/client-go/kubernetes/scheme" clientgoscheme "k8s.io/client-go/kubernetes/scheme"
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
ctrl "sigs.k8s.io/controller-runtime" ctrl "sigs.k8s.io/controller-runtime"
crtlmetrics "sigs.k8s.io/controller-runtime/pkg/metrics"
"github.com/fluxcd/pkg/runtime/client" "github.com/fluxcd/pkg/runtime/client"
helper "github.com/fluxcd/pkg/runtime/controller"
"github.com/fluxcd/pkg/runtime/events" "github.com/fluxcd/pkg/runtime/events"
"github.com/fluxcd/pkg/runtime/leaderelection" "github.com/fluxcd/pkg/runtime/leaderelection"
"github.com/fluxcd/pkg/runtime/logger" "github.com/fluxcd/pkg/runtime/logger"
"github.com/fluxcd/pkg/runtime/metrics"
"github.com/fluxcd/pkg/runtime/pprof" "github.com/fluxcd/pkg/runtime/pprof"
"github.com/fluxcd/pkg/runtime/probes" "github.com/fluxcd/pkg/runtime/probes"
@ -114,6 +113,7 @@ func main() {
clientOptions.BindFlags(flag.CommandLine) clientOptions.BindFlags(flag.CommandLine)
logOptions.BindFlags(flag.CommandLine) logOptions.BindFlags(flag.CommandLine)
leaderElectionOptions.BindFlags(flag.CommandLine) leaderElectionOptions.BindFlags(flag.CommandLine)
flag.Parse() flag.Parse()
ctrl.SetLogger(logger.NewLogger(logOptions)) ctrl.SetLogger(logger.NewLogger(logOptions))
@ -152,16 +152,12 @@ func main() {
pprof.SetupHandlers(mgr, setupLog) pprof.SetupHandlers(mgr, setupLog)
var eventRecorder *events.Recorder var eventRecorder *events.Recorder
if eventsAddr != "" { if eventRecorder, err = events.NewRecorder(mgr, ctrl.Log, eventsAddr, controllerName); err != nil {
var err error setupLog.Error(err, "unable to create event recorder")
if eventRecorder, err = events.NewRecorder(mgr, ctrl.Log, eventsAddr, controllerName); err != nil { os.Exit(1)
setupLog.Error(err, "unable to create event recorder")
os.Exit(1)
}
} }
metricsRecorder := metrics.NewRecorder() metricsH := helper.MustMakeMetrics(mgr)
crtlmetrics.Registry.MustRegister(metricsRecorder.Collectors()...)
if storageAdvAddr == "" { if storageAdvAddr == "" {
storageAdvAddr = determineAdvStorageAddr(storageAddr, setupLog) storageAdvAddr = determineAdvStorageAddr(storageAddr, setupLog)
@ -169,12 +165,11 @@ func main() {
storage := mustInitStorage(storagePath, storageAdvAddr, setupLog) storage := mustInitStorage(storagePath, storageAdvAddr, setupLog)
if err = (&controllers.GitRepositoryReconciler{ if err = (&controllers.GitRepositoryReconciler{
Client: mgr.GetClient(), Client: mgr.GetClient(),
Scheme: mgr.GetScheme(), Scheme: mgr.GetScheme(),
Storage: storage, Storage: storage,
EventRecorder: mgr.GetEventRecorderFor(controllerName), EventRecorder: eventRecorder,
ExternalEventRecorder: eventRecorder, MetricsRecorder: metricsH.MetricsRecorder,
MetricsRecorder: metricsRecorder,
}).SetupWithManagerAndOptions(mgr, controllers.GitRepositoryReconcilerOptions{ }).SetupWithManagerAndOptions(mgr, controllers.GitRepositoryReconcilerOptions{
MaxConcurrentReconciles: concurrent, MaxConcurrentReconciles: concurrent,
DependencyRequeueInterval: requeueDependency, DependencyRequeueInterval: requeueDependency,
@ -183,13 +178,12 @@ func main() {
os.Exit(1) os.Exit(1)
} }
if err = (&controllers.HelmRepositoryReconciler{ if err = (&controllers.HelmRepositoryReconciler{
Client: mgr.GetClient(), Client: mgr.GetClient(),
Scheme: mgr.GetScheme(), Scheme: mgr.GetScheme(),
Storage: storage, Storage: storage,
Getters: getters, Getters: getters,
EventRecorder: mgr.GetEventRecorderFor(controllerName), EventRecorder: eventRecorder,
ExternalEventRecorder: eventRecorder, MetricsRecorder: metricsH.MetricsRecorder,
MetricsRecorder: metricsRecorder,
}).SetupWithManagerAndOptions(mgr, controllers.HelmRepositoryReconcilerOptions{ }).SetupWithManagerAndOptions(mgr, controllers.HelmRepositoryReconcilerOptions{
MaxConcurrentReconciles: concurrent, MaxConcurrentReconciles: concurrent,
}); err != nil { }); err != nil {
@ -197,13 +191,12 @@ func main() {
os.Exit(1) os.Exit(1)
} }
if err = (&controllers.HelmChartReconciler{ if err = (&controllers.HelmChartReconciler{
Client: mgr.GetClient(), Client: mgr.GetClient(),
Scheme: mgr.GetScheme(), Scheme: mgr.GetScheme(),
Storage: storage, Storage: storage,
Getters: getters, Getters: getters,
EventRecorder: mgr.GetEventRecorderFor(controllerName), EventRecorder: eventRecorder,
ExternalEventRecorder: eventRecorder, MetricsRecorder: metricsH.MetricsRecorder,
MetricsRecorder: metricsRecorder,
}).SetupWithManagerAndOptions(mgr, controllers.HelmChartReconcilerOptions{ }).SetupWithManagerAndOptions(mgr, controllers.HelmChartReconcilerOptions{
MaxConcurrentReconciles: concurrent, MaxConcurrentReconciles: concurrent,
}); err != nil { }); err != nil {
@ -211,12 +204,11 @@ func main() {
os.Exit(1) os.Exit(1)
} }
if err = (&controllers.BucketReconciler{ if err = (&controllers.BucketReconciler{
Client: mgr.GetClient(), Client: mgr.GetClient(),
Scheme: mgr.GetScheme(), Scheme: mgr.GetScheme(),
Storage: storage, Storage: storage,
EventRecorder: mgr.GetEventRecorderFor(controllerName), EventRecorder: eventRecorder,
ExternalEventRecorder: eventRecorder, MetricsRecorder: metricsH.MetricsRecorder,
MetricsRecorder: metricsRecorder,
}).SetupWithManagerAndOptions(mgr, controllers.BucketReconcilerOptions{ }).SetupWithManagerAndOptions(mgr, controllers.BucketReconcilerOptions{
MaxConcurrentReconciles: concurrent, MaxConcurrentReconciles: concurrent,
}); err != nil { }); err != nil {