@@ -18,9 +18,12 @@ import (
1818 "context"
1919 "fmt"
2020 "log/slog"
21+ "os"
2122 "time"
2223
2324 "github.com/blang/semver/v4"
25+ gokitlog "github.com/go-kit/log"
26+ "github.com/go-kit/log/level"
2427 "github.com/go-logr/logr"
2528 monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
2629 promv1alpha1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1alpha1"
@@ -50,6 +53,8 @@ const (
5053)
5154
5255func NewPrometheusCRWatcher (ctx context.Context , logger logr.Logger , cfg allocatorconfig.Config ) (* PrometheusCRWatcher , error ) {
56+ // TODO: Remove this after go 1.23 upgrade
57+ promLogger := level .NewFilter (gokitlog .NewLogfmtLogger (os .Stderr ), level .AllowWarn ())
5358 slogger := slog .New (logr .ToSlogHandler (logger ))
5459 var resourceSelector * prometheus.ResourceSelector
5560 mClient , err := monitoringclient .NewForConfig (cfg .ClusterConfig )
@@ -90,7 +95,7 @@ func NewPrometheusCRWatcher(ctx context.Context, logger logr.Logger, cfg allocat
9095 },
9196 }
9297
93- generator , err := prometheus .NewConfigGenerator (slogger , prom , prometheus . WithEndpointSliceSupport () )
98+ generator , err := prometheus .NewConfigGenerator (promLogger , prom , true )
9499
95100 if err != nil {
96101 return nil , err
@@ -108,7 +113,7 @@ func NewPrometheusCRWatcher(ctx context.Context, logger logr.Logger, cfg allocat
108113 logger .Error (err , "Retrying namespace informer creation in promOperator CRD watcher" )
109114 return true
110115 }, func () error {
111- nsMonInf , err = getNamespaceInformer (ctx , map [string ]struct {}{v1 .NamespaceAll : {}}, slogger , clientset , operatorMetrics )
116+ nsMonInf , err = getNamespaceInformer (ctx , map [string ]struct {}{v1 .NamespaceAll : {}}, promLogger , clientset , operatorMetrics )
112117 return err
113118 })
114119 if getNamespaceInformerErr != nil {
@@ -158,7 +163,7 @@ type PrometheusCRWatcher struct {
158163 store * assets.StoreBuilder
159164}
160165
161- func getNamespaceInformer (ctx context.Context , allowList map [string ]struct {}, promOperatorLogger * slog .Logger , clientset kubernetes.Interface , operatorMetrics * operator.Metrics ) (cache.SharedIndexInformer , error ) {
166+ func getNamespaceInformer (ctx context.Context , allowList map [string ]struct {}, promOperatorLogger gokitlog .Logger , clientset kubernetes.Interface , operatorMetrics * operator.Metrics ) (cache.SharedIndexInformer , error ) {
162167 kubernetesVersion , err := clientset .Discovery ().ServerVersion ()
163168 if err != nil {
164169 return nil , err
@@ -225,7 +230,7 @@ func (w *PrometheusCRWatcher) Watch(upstreamEvents chan Event, upstreamErrors ch
225230
226231 if w .nsInformer != nil {
227232 go w .nsInformer .Run (w .stopChannel )
228- if ok := cache .WaitForNamedCacheSync ("namespace" , w . stopChannel , w .nsInformer .HasSynced ); ! ok {
233+ if ok := w .WaitForNamedCacheSync ("namespace" , w .nsInformer .HasSynced ); ! ok {
229234 success = false
230235 }
231236
@@ -248,7 +253,7 @@ func (w *PrometheusCRWatcher) Watch(upstreamEvents chan Event, upstreamErrors ch
248253 } {
249254 sync , err := k8sutil .LabelSelectionHasChanged (old .Labels , cur .Labels , selector )
250255 if err != nil {
251- w .logger .Error (err . Error (), "Failed to check label selection between namespaces while handling namespace updates" , "selector" , name )
256+ w .logger .Error ("Failed to check label selection between namespaces while handling namespace updates" , "selector" , name , "error" , err )
252257 return
253258 }
254259
@@ -375,7 +380,7 @@ func (w *PrometheusCRWatcher) LoadConfig(ctx context.Context) (*promconfig.Confi
375380 "" ,
376381 nil ,
377382 nil ,
378- & monitoringv1.TSDBSpec {},
383+ monitoringv1.TSDBSpec {},
379384 nil ,
380385 nil ,
381386 serviceMonitorInstances ,
0 commit comments