Skip to content

Commit 6791b05

Browse files
author
Israel Blancas
authored
Merge branch 'main' into feature/3149
2 parents 8af2a31 + 4ebb467 commit 6791b05

File tree

2 files changed

+78
-75
lines changed

2 files changed

+78
-75
lines changed

go.mod

+26-25
Original file line numberDiff line numberDiff line change
@@ -23,32 +23,32 @@ require (
2323
github.com/operator-framework/api v0.27.0
2424
github.com/operator-framework/operator-lib v0.15.0
2525
github.com/prometheus-operator/prometheus-operator v0.76.0
26-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.76.1
27-
github.com/prometheus-operator/prometheus-operator/pkg/client v0.76.1
26+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.76.2
27+
github.com/prometheus-operator/prometheus-operator/pkg/client v0.76.2
2828
github.com/prometheus/client_golang v1.20.3
2929
github.com/prometheus/common v0.59.1
3030
github.com/prometheus/prometheus v0.54.1
3131
github.com/shirou/gopsutil v3.21.11+incompatible
3232
github.com/spf13/pflag v1.0.5
3333
github.com/stretchr/testify v1.9.0
34-
go.opentelemetry.io/collector/featuregate v1.14.1
35-
go.opentelemetry.io/otel v1.29.0
36-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.29.0
37-
go.opentelemetry.io/otel/exporters/prometheus v0.51.0
38-
go.opentelemetry.io/otel/metric v1.29.0
39-
go.opentelemetry.io/otel/sdk v1.29.0
40-
go.opentelemetry.io/otel/sdk/metric v1.29.0
34+
go.opentelemetry.io/collector/featuregate v1.15.0
35+
go.opentelemetry.io/otel v1.30.0
36+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.30.0
37+
go.opentelemetry.io/otel/exporters/prometheus v0.52.0
38+
go.opentelemetry.io/otel/metric v1.30.0
39+
go.opentelemetry.io/otel/sdk v1.30.0
40+
go.opentelemetry.io/otel/sdk/metric v1.30.0
4141
go.uber.org/multierr v1.11.0
4242
go.uber.org/zap v1.27.0
4343
gopkg.in/yaml.v2 v2.4.0
4444
gopkg.in/yaml.v3 v3.0.1
45-
k8s.io/api v0.31.0
46-
k8s.io/apiextensions-apiserver v0.31.0
47-
k8s.io/apimachinery v0.31.0
48-
k8s.io/client-go v0.31.0
49-
k8s.io/component-base v0.31.0
45+
k8s.io/api v0.31.1
46+
k8s.io/apiextensions-apiserver v0.31.1
47+
k8s.io/apimachinery v0.31.1
48+
k8s.io/client-go v0.31.1
49+
k8s.io/component-base v0.31.1
5050
k8s.io/klog/v2 v2.130.1
51-
k8s.io/kubectl v0.31.0
51+
k8s.io/kubectl v0.31.1
5252
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
5353
sigs.k8s.io/controller-runtime v0.19.0
5454
sigs.k8s.io/yaml v1.4.0
@@ -87,7 +87,7 @@ require (
8787
github.com/edsrzf/mmap-go v1.1.0 // indirect
8888
github.com/efficientgo/core v1.0.0-rc.2 // indirect
8989
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
90-
github.com/envoyproxy/go-control-plane v0.12.0 // indirect
90+
github.com/envoyproxy/go-control-plane v0.12.1-0.20240621013728-1eb8caab5155 // indirect
9191
github.com/envoyproxy/protoc-gen-validate v1.0.4 // indirect
9292
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
9393
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb // indirect
@@ -177,6 +177,7 @@ require (
177177
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
178178
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
179179
github.com/pkg/errors v0.9.1 // indirect
180+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
180181
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
181182
github.com/prometheus-community/prom-label-proxy v0.11.0 // indirect
182183
github.com/prometheus/alertmanager v0.27.0 // indirect
@@ -196,26 +197,26 @@ require (
196197
go.mongodb.org/mongo-driver v1.14.0 // indirect
197198
go.opencensus.io v0.24.0 // indirect
198199
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
199-
go.opentelemetry.io/otel/trace v1.29.0 // indirect
200+
go.opentelemetry.io/otel/trace v1.30.0 // indirect
200201
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
201202
go.uber.org/atomic v1.11.0 // indirect
202203
golang.org/x/arch v0.8.0 // indirect
203-
golang.org/x/crypto v0.26.0 // indirect
204+
golang.org/x/crypto v0.27.0 // indirect
204205
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
205206
golang.org/x/mod v0.20.0 // indirect
206-
golang.org/x/net v0.28.0 // indirect
207+
golang.org/x/net v0.29.0 // indirect
207208
golang.org/x/oauth2 v0.22.0 // indirect
208209
golang.org/x/sync v0.8.0 // indirect
209-
golang.org/x/sys v0.24.0 // indirect
210-
golang.org/x/term v0.23.0 // indirect
211-
golang.org/x/text v0.17.0 // indirect
210+
golang.org/x/sys v0.25.0 // indirect
211+
golang.org/x/term v0.24.0 // indirect
212+
golang.org/x/text v0.18.0 // indirect
212213
golang.org/x/time v0.6.0 // indirect
213214
golang.org/x/tools v0.24.0 // indirect
214215
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
215216
google.golang.org/api v0.188.0 // indirect
216-
google.golang.org/genproto/googleapis/api v0.0.0-20240822170219-fc7c04adadcd // indirect
217-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd // indirect
218-
google.golang.org/grpc v1.65.0 // indirect
217+
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
218+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
219+
google.golang.org/grpc v1.66.1 // indirect
219220
google.golang.org/protobuf v1.34.2 // indirect
220221
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
221222
gopkg.in/inf.v0 v0.9.1 // indirect

0 commit comments

Comments
 (0)