clean

cmd/monitor/run.go

@@ -44,15 +44,10 @@ func run(ctx context.Context) error {
 
 	logexporter.SetupLogExporter(logger, client)
 
-	clusterIDHandler := func(clusterID string) {
-		log.Data["cluster_id"] = clusterID
-		log.Data["version"] = binVersion.Version
-	}
-
-	return runMonitorMode(ctx, log, &cfg, clusterIDHandler)
+	return runMonitorMode(ctx, log, &cfg)
 }
 
-func runMonitorMode(ctx context.Context, log *logrus.Entry, cfg *config.Config, clusterIDChanged func(clusterID string)) error {
+func runMonitorMode(ctx context.Context, log *logrus.Entry, cfg *config.Config) error {
 	restConfig, err := config.RetrieveKubeConfig(log)
 	if err != nil {
 		return fmt.Errorf("retrieving kubeconfig: %w", err)
@@ -62,5 +57,5 @@ func runMonitorMode(ctx context.Context, log *logrus.Entry, cfg *config.Config,
 		return fmt.Errorf("obtaining kubernetes clientset: %w", err)
 	}
 
-	return monitor.Run(ctx, log, clientSet, cfg.MonitorMetadataPath, cfg.SelfPod, clusterIDChanged)
+	return monitor.Run(ctx, log, clientSet, cfg.MonitorMetadataPath, cfg.SelfPod)
 }

internal/monitor/monitor.go

@@ -15,7 +15,7 @@ import (
 	"github.com/castai/cluster-controller/internal/config"
 )
 
-func Run(ctx context.Context, log logrus.FieldLogger, clientset *kubernetes.Clientset, metadataFile string, pod config.Pod, clusterIDHandler func(clusterID string)) error {
+func Run(ctx context.Context, log logrus.FieldLogger, clientset *kubernetes.Clientset, metadataFile string, pod config.Pod) error {
 	m := monitor{
 		clientset: clientset,
 		log:       log,
@@ -32,7 +32,6 @@ func Run(ctx context.Context, log logrus.FieldLogger, clientset *kubernetes.Clie
 		case <-ctx.Done():
 			return nil
 		case metadata := <-metadataUpdates:
-			clusterIDHandler(metadata.ClusterID)
 			m.metadataUpdated(ctx, metadata)
 		}
 	}