Skip to content

Commit 1d613a3

Browse files
swiatekmswiatekm
authored
Bump prometheus-operator to 0.77.2 (#3752)
1 parent 165a55a commit 1d613a3

File tree

4 files changed

+16
-22
lines changed

4 files changed

+16
-22
lines changed

‎cmd/otel-allocator/internal/watcher/promOperator.go

+4-7
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import (
1111
"time"
1212

1313
"github.com/blang/semver/v4"
14-
gokitlog "github.com/go-kit/log"
15-
"github.com/go-kit/log/level"
1614
"github.com/go-logr/logr"
1715
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
1816
promv1alpha1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1alpha1"
@@ -42,8 +40,7 @@ const (
4240
)
4341

4442
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}))
4744
slogger := slog.New(logr.ToSlogHandler(logger))
4845
var resourceSelector *prometheus.ResourceSelector
4946
mClient, err := monitoringclient.NewForConfig(cfg.ClusterConfig)
@@ -84,7 +81,7 @@ func NewPrometheusCRWatcher(ctx context.Context, logger logr.Logger, cfg allocat
8481
},
8582
}
8683

87-
generator, err := prometheus.NewConfigGenerator(promLogger, prom, true)
84+
generator, err := prometheus.NewConfigGenerator(promLogger, prom, prometheus.WithEndpointSliceSupport())
8885

8986
if err != nil {
9087
return nil, err
@@ -152,7 +149,7 @@ type PrometheusCRWatcher struct {
152149
store *assets.StoreBuilder
153150
}
154151

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) {
156153
kubernetesVersion, err := clientset.Discovery().ServerVersion()
157154
if err != nil {
158155
return nil, err
@@ -369,7 +366,7 @@ func (w *PrometheusCRWatcher) LoadConfig(ctx context.Context) (*promconfig.Confi
369366
"",
370367
nil,
371368
nil,
372-
monitoringv1.TSDBSpec{},
369+
&monitoringv1.TSDBSpec{},
373370
nil,
374371
nil,
375372
serviceMonitorInstances,

‎cmd/otel-allocator/internal/watcher/promOperator_test.go

+3-6
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ import (
1010
"testing"
1111
"time"
1212

13-
"github.com/go-kit/log"
14-
"github.com/go-kit/log/level"
1513
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
1614
promv1alpha1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1alpha1"
1715
"github.com/prometheus-operator/prometheus-operator/pkg/assets"
@@ -1243,10 +1241,9 @@ func getTestPrometheusCRWatcher(t *testing.T, svcMonitors []*monitoringv1.Servic
12431241
},
12441242
}
12451243

1246-
promOperatorLogger := level.NewFilter(log.NewLogfmtLogger(os.Stderr), level.AllowWarn())
1247-
promOperatorSlogLogger := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelWarn}))
1244+
promOperatorLogger := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelWarn}))
12481245

1249-
generator, err := prometheus.NewConfigGenerator(promOperatorLogger, prom, true)
1246+
generator, err := prometheus.NewConfigGenerator(promOperatorLogger, prom, prometheus.WithEndpointSliceSupport())
12501247
if err != nil {
12511248
t.Fatal(t, err)
12521249
}
@@ -1268,7 +1265,7 @@ func getTestPrometheusCRWatcher(t *testing.T, svcMonitors []*monitoringv1.Servic
12681265
// create the shared informer and resync every 1s
12691266
nsMonInf := cache.NewSharedInformer(source, &v1.Namespace{}, 1*time.Second).(cache.SharedIndexInformer)
12701267

1271-
resourceSelector, err := prometheus.NewResourceSelector(promOperatorSlogLogger, prom, store, nsMonInf, operatorMetrics, eventRecorder)
1268+
resourceSelector, err := prometheus.NewResourceSelector(promOperatorLogger, prom, store, nsMonInf, operatorMetrics, eventRecorder)
12721269
require.NoError(t, err)
12731270

12741271
return &PrometheusCRWatcher{

‎go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ require (
2323
github.com/openshift/api v0.0.0-20240124164020-e2ce40831f2e
2424
github.com/operator-framework/api v0.29.0
2525
github.com/operator-framework/operator-lib v0.17.0
26-
github.com/prometheus-operator/prometheus-operator v0.76.2
27-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.76.2
28-
github.com/prometheus-operator/prometheus-operator/pkg/client v0.76.2
26+
github.com/prometheus-operator/prometheus-operator v0.77.2
27+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.77.2
28+
github.com/prometheus-operator/prometheus-operator/pkg/client v0.77.2
2929
github.com/prometheus/client_golang v1.21.0
3030
github.com/prometheus/common v0.62.0
3131
github.com/prometheus/prometheus v0.55.1

‎go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -537,12 +537,12 @@ github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndr
537537
github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
538538
github.com/prometheus-community/prom-label-proxy v0.11.0 h1:IO02WiiFMfcIqvjhwMbCYnDJiTNcSHBrkCGRQ/7KDd0=
539539
github.com/prometheus-community/prom-label-proxy v0.11.0/go.mod h1:lfvrG70XqsxWDrSh1843QXBG0fSg8EbIXmAo8xGsvw8=
540-
github.com/prometheus-operator/prometheus-operator v0.76.2 h1:B+UcRc7py+zpow2H+q2V8sPF3jmsQNreJujBt36wZ+Q=
541-
github.com/prometheus-operator/prometheus-operator v0.76.2/go.mod h1:g8uevau0bHz6HcqFW/hDbhmrgdQsmZBpGV/aKOSj+XI=
542-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.76.2 h1:BpGDC87A2SaxbKgONsFLEX3kRcRJee2aLQbjXsuz0hA=
543-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.76.2/go.mod h1:Rd8YnCqz+2FYsiGmE2DMlaLjQRB4v2jFNnzCt9YY4IM=
544-
github.com/prometheus-operator/prometheus-operator/pkg/client v0.76.2 h1:yncs8NglhE3hB+viNsabCAF9TBBDOBljHUyxHC5fSGY=
545-
github.com/prometheus-operator/prometheus-operator/pkg/client v0.76.2/go.mod h1:AfbzyEUFxJmSoTiMcgNHHjDKcorBVd9TIwx0viURgEw=
540+
github.com/prometheus-operator/prometheus-operator v0.77.2 h1:HRewl8m49URAOfRTZql2YjjNGZ8+25srcGji5wx/tic=
541+
github.com/prometheus-operator/prometheus-operator v0.77.2/go.mod h1:y2XLK9xQ4ulaAtWmvKDM+hQNl7w2Wv/iE+tuF5Xnb8A=
542+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.77.2 h1:F/MALZ518KfI1zEg+Kg8/uTzoXKDyqw+LNC/5irJlJE=
543+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.77.2/go.mod h1:D0KY8md81DQKdaR/cXwnhoWB3MYYyc/UjvqE8GFkIvA=
544+
github.com/prometheus-operator/prometheus-operator/pkg/client v0.77.2 h1:rEBVlnqBSkNc6ufXnDu/GtSyS2jL1l6imtufzJUfOXI=
545+
github.com/prometheus-operator/prometheus-operator/pkg/client v0.77.2/go.mod h1:Q+R7L3DIlJ2a8R+W+7wjk0B25Ci/VTy7V07Zvq327x0=
546546
github.com/prometheus/alertmanager v0.27.0 h1:V6nTa2J5V4s8TG4C4HtrBP/WNSebCCTYGGv4qecA/+I=
547547
github.com/prometheus/alertmanager v0.27.0/go.mod h1:8Ia/R3urPmbzJ8OsdvmZvIprDwvwmYCmUbwBL+jlPOE=
548548
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=

0 commit comments

Comments
 (0)