Skip to content

Commit 877b6fd

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #965 from tmshort/update-distrib-4.18
OCPBUGS-50830, OCPBUGS-50832, OCPBUGS-50836: Bump github.com/distribution/distribution/v3
2 parents 182471a + e31a86b commit 877b6fd

File tree

186 files changed

+11218
-2457
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+11218
-2457
lines changed

‎go.mod

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/openshift/operator-framework-olm
22

3-
go 1.22.5
3+
go 1.22.7
44

55
require (
66
github.com/blang/semver/v4 v4.0.0
@@ -20,7 +20,7 @@ require (
2020
github.com/spf13/cobra v1.8.1
2121
github.com/stretchr/testify v1.10.0
2222
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
23-
google.golang.org/protobuf v1.35.1
23+
google.golang.org/protobuf v1.36.3
2424
gopkg.in/yaml.v2 v2.4.0
2525
k8s.io/api v0.31.2
2626
k8s.io/apimachinery v0.31.2
@@ -110,7 +110,7 @@ require (
110110
github.com/gorilla/websocket v1.5.0 // indirect
111111
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect
112112
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
113-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
113+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
114114
github.com/h2non/filetype v1.1.3 // indirect
115115
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
116116
github.com/imdario/mergo v0.3.16 // indirect
@@ -122,7 +122,7 @@ require (
122122
github.com/josharian/intern v1.0.0 // indirect
123123
github.com/json-iterator/go v1.1.12 // indirect
124124
github.com/kisielk/errcheck v1.7.0 // indirect
125-
github.com/klauspost/compress v1.17.9 // indirect
125+
github.com/klauspost/compress v1.17.11 // indirect
126126
github.com/kylelemons/godebug v1.1.0 // indirect
127127
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
128128
github.com/mailru/easyjson v0.7.7 // indirect
@@ -154,7 +154,7 @@ require (
154154
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
155155
github.com/prometheus/client_golang v1.20.5 // indirect
156156
github.com/prometheus/client_model v0.6.1 // indirect
157-
github.com/prometheus/common v0.60.1 // indirect
157+
github.com/prometheus/common v0.62.0 // indirect
158158
github.com/prometheus/procfs v0.15.1 // indirect
159159
github.com/russross/blackfriday/v2 v2.1.0 // indirect
160160
github.com/spf13/pflag v1.0.5 // indirect
@@ -169,15 +169,22 @@ require (
169169
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
170170
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
171171
go.opencensus.io v0.24.0 // indirect
172+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
173+
go.opentelemetry.io/contrib/bridges/prometheus v0.59.0 // indirect
172174
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
173-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
174-
go.opentelemetry.io/otel v1.29.0 // indirect
175-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 // indirect
176-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
177-
go.opentelemetry.io/otel/metric v1.29.0 // indirect
178-
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
179-
go.opentelemetry.io/otel/trace v1.29.0 // indirect
180-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
175+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect
176+
go.opentelemetry.io/otel v1.34.0 // indirect
177+
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.10.0 // indirect
178+
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.10.0 // indirect
179+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect
180+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 // indirect
181+
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.10.0 // indirect
182+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
183+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
184+
go.opentelemetry.io/otel/sdk/log v0.10.0 // indirect
185+
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
186+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
187+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
181188
go.uber.org/multierr v1.11.0 // indirect
182189
go.uber.org/zap v1.26.0 // indirect
183190
golang.org/x/crypto v0.32.0 // indirect
@@ -195,9 +202,9 @@ require (
195202
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
196203
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
197204
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
198-
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
199-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
200-
google.golang.org/grpc v1.68.1 // indirect
205+
google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect
206+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
207+
google.golang.org/grpc v1.69.4 // indirect
201208
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
202209
gopkg.in/inf.v0 v0.9.1 // indirect
203210
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect

0 commit comments

Comments
 (0)