@@ -11,8 +11,6 @@ import (
11
11
"time"
12
12
13
13
"github.com/blang/semver/v4"
14
- gokitlog "github.com/go-kit/log"
15
- "github.com/go-kit/log/level"
16
14
"github.com/go-logr/logr"
17
15
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
18
16
promv1alpha1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1alpha1"
@@ -42,8 +40,7 @@ const (
42
40
)
43
41
44
42
func NewPrometheusCRWatcher (ctx context.Context , logger logr.Logger , cfg allocatorconfig.Config ) (* PrometheusCRWatcher , error ) {
45
- // TODO: Remove this after go 1.23 upgrade
46
- promLogger := level .NewFilter (gokitlog .NewLogfmtLogger (os .Stderr ), level .AllowWarn ())
43
+ promLogger := slog .New (slog .NewTextHandler (os .Stderr , & slog.HandlerOptions {Level : slog .LevelWarn }))
47
44
slogger := slog .New (logr .ToSlogHandler (logger ))
48
45
var resourceSelector * prometheus.ResourceSelector
49
46
mClient , err := monitoringclient .NewForConfig (cfg .ClusterConfig )
@@ -84,7 +81,7 @@ func NewPrometheusCRWatcher(ctx context.Context, logger logr.Logger, cfg allocat
84
81
},
85
82
}
86
83
87
- generator , err := prometheus .NewConfigGenerator (promLogger , prom , true )
84
+ generator , err := prometheus .NewConfigGenerator (promLogger , prom , prometheus . WithEndpointSliceSupport () )
88
85
89
86
if err != nil {
90
87
return nil , err
@@ -152,7 +149,7 @@ type PrometheusCRWatcher struct {
152
149
store * assets.StoreBuilder
153
150
}
154
151
155
- func getNamespaceInformer (ctx context.Context , allowList map [string ]struct {}, promOperatorLogger gokitlog .Logger , clientset kubernetes.Interface , operatorMetrics * operator.Metrics ) (cache.SharedIndexInformer , error ) {
152
+ func getNamespaceInformer (ctx context.Context , allowList map [string ]struct {}, promOperatorLogger * slog .Logger , clientset kubernetes.Interface , operatorMetrics * operator.Metrics ) (cache.SharedIndexInformer , error ) {
156
153
kubernetesVersion , err := clientset .Discovery ().ServerVersion ()
157
154
if err != nil {
158
155
return nil , err
@@ -369,7 +366,7 @@ func (w *PrometheusCRWatcher) LoadConfig(ctx context.Context) (*promconfig.Confi
369
366
"" ,
370
367
nil ,
371
368
nil ,
372
- monitoringv1.TSDBSpec {},
369
+ & monitoringv1.TSDBSpec {},
373
370
nil ,
374
371
nil ,
375
372
serviceMonitorInstances ,
0 commit comments