add log

Author: ColdsteelRail

controller/runnable/initializer.go

@@ -1,6 +1,7 @@
 package runnable
 
 import (
+	"github.com/go-logr/logr"
 	controllerruntime "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
@@ -14,7 +15,7 @@ func InitializeRunnable(mgr manager.Manager, opts controllerruntime.Options) err
 	// register leader metrics
 	metrics.RegisterLeaderRunningMetrics()
 	// register runnable
-	addRunnable(opts)
+	addRunnable(opts, mgr.GetLogger())
 	for _, runnable := range runnable {
 		if err := mgr.Add(runnable); err != nil {
 			return err
@@ -23,9 +24,9 @@ func InitializeRunnable(mgr manager.Manager, opts controllerruntime.Options) err
 	return nil
 }
 
-func addRunnable(opts controllerruntime.Options) {
+func addRunnable(opts controllerruntime.Options, logger logr.Logger) {
 	runnable = append(runnable,
-		&LeaderMetricsRunnable{leaseName: opts.LeaderElectionID},
-		&NoneLeaderMetricRunnable{enableLeaderElection: opts.LeaderElection, leaseName: opts.LeaderElectionID},
+		&LeaderMetricsRunnable{leaseName: opts.LeaderElectionID, logger: logger},
+		&NoneLeaderMetricRunnable{enableLeaderElection: opts.LeaderElection, leaseName: opts.LeaderElectionID, logger: logger},
 	)
 }

controller/runnable/leader_monitor.go

@@ -10,6 +10,7 @@ import (
 
 // LeaderMetricsRunnable is a runnable that records the leader metrics
 type LeaderMetricsRunnable struct {
+	logger    logr.Logger
 	leaseName string
 }
 
@@ -18,15 +19,15 @@ func (l LeaderMetricsRunnable) NeedLeaderElection() bool {
 }
 
 func (l LeaderMetricsRunnable) Start(ctx context.Context) error {
-	logger := logr.FromContextOrDiscard(ctx)
 	m := metrics.LeaderRunningMetrics{Lease: l.leaseName}
 	m.Lead()
-	logger.Info("enable leader election, start LeaderMetricsRunnable, record leader metrics")
+	l.logger.Info("enable leader election, start LeaderMetricsRunnable, record leader metrics")
 	return nil
 }
 
 // NoneLeaderMetricRunnable is a runnable that records the none leader metrics
 type NoneLeaderMetricRunnable struct {
+	logger               logr.Logger
 	leaseName            string
 	enableLeaderElection bool
 }
@@ -36,14 +37,13 @@ func (nl NoneLeaderMetricRunnable) NeedLeaderElection() bool {
 }
 
 func (nl NoneLeaderMetricRunnable) Start(ctx context.Context) error {
-	logger := logr.FromContextOrDiscard(ctx)
 	m := metrics.LeaderRunningMetrics{Lease: nl.leaseName}
 	if nl.enableLeaderElection {
 		m.UnLead()
-		logger.Info("enable leader election, start NoneLeaderMetricRunnable, record none leader metrics")
+		nl.logger.Info("enable leader election, start NoneLeaderMetricRunnable, record none leader metrics")
 	} else {
 		m.Lead()
-		logger.Info("disable leader election, start NoneLeaderMetricRunnable, record leader metrics")
+		nl.logger.Info("disable leader election, start NoneLeaderMetricRunnable, record leader metrics")
 	}
 	return nil
 }