Skip to content

Commit 3f6b843

Browse files
Merge pull request #6528 from pmtk/grpc-cve-4.17
[release-4.17] OCPBUGS-80007: Replace google.golang.org/grpc with openshift-sustaining fork
2 parents fcc951f + 84be1b1 commit 3f6b843

857 files changed

Lines changed: 51370 additions & 46643 deletions

File tree

Some content is hidden

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

etcd/go.mod

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ require (
3434
github.com/russross/blackfriday/v2 v2.1.0 // indirect
3535
github.com/vishvananda/netlink v1.1.0 // indirect
3636
github.com/vishvananda/netns v0.0.4 // indirect
37-
go.opentelemetry.io/otel/metric v1.20.0 // indirect
37+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
3838
golang.org/x/sync v0.10.0 // indirect
39-
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
40-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
39+
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
40+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
4141
k8s.io/apiserver v0.30.1 // indirect
4242
)
4343

@@ -47,7 +47,7 @@ require (
4747
github.com/apparentlymart/go-cidr v1.1.0 // indirect
4848
github.com/beorn7/perks v1.0.1 // indirect
4949
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
50-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
50+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5151
github.com/chai2010/gettext-go v1.0.2 // indirect
5252
github.com/coreos/go-semver v0.3.1 // indirect
5353
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
@@ -57,7 +57,7 @@ require (
5757
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
5858
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
5959
github.com/go-errors/errors v1.4.2 // indirect
60-
github.com/go-logr/logr v1.4.1 // indirect
60+
github.com/go-logr/logr v1.4.2 // indirect
6161
github.com/go-openapi/jsonpointer v0.19.6 // indirect
6262
github.com/go-openapi/jsonreference v0.20.2 // indirect
6363
github.com/go-openapi/swag v0.22.3 // indirect
@@ -67,7 +67,7 @@ require (
6767
github.com/google/btree v1.0.1 // indirect
6868
github.com/google/gofuzz v1.2.0 // indirect
6969
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
70-
github.com/google/uuid v1.3.1 // indirect
70+
github.com/google/uuid v1.6.0 // indirect
7171
github.com/gorilla/websocket v1.5.0 // indirect
7272
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
7373
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
@@ -91,7 +91,7 @@ require (
9191
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
9292
github.com/pkg/errors v0.9.1 // indirect
9393
github.com/prometheus/client_golang v1.16.0 // indirect
94-
github.com/prometheus/client_model v0.4.0 // indirect
94+
github.com/prometheus/client_model v0.6.0 // indirect
9595
github.com/prometheus/common v0.44.0 // indirect
9696
github.com/prometheus/procfs v0.10.1 // indirect
9797
github.com/sirupsen/logrus v1.9.3 // indirect
@@ -108,26 +108,25 @@ require (
108108
go.etcd.io/etcd/pkg/v3 v3.5.18 // indirect
109109
go.etcd.io/etcd/raft/v3 v3.5.18 // indirect
110110
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
111-
go.opentelemetry.io/otel v1.20.0 // indirect
111+
go.opentelemetry.io/otel v1.28.0 // indirect
112112
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
113113
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
114-
go.opentelemetry.io/otel/sdk v1.20.0 // indirect
115-
go.opentelemetry.io/otel/trace v1.20.0 // indirect
114+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
115+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
116116
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
117117
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
118118
go.uber.org/multierr v1.11.0 // indirect
119119
go.uber.org/zap v1.26.0 // indirect
120120
golang.org/x/crypto v0.32.0 // indirect
121121
golang.org/x/net v0.34.0 // indirect
122-
golang.org/x/oauth2 v0.11.0 // indirect
122+
golang.org/x/oauth2 v0.22.0 // indirect
123123
golang.org/x/sys v0.29.0 // indirect
124124
golang.org/x/term v0.28.0 // indirect
125125
golang.org/x/text v0.21.0 // indirect
126126
golang.org/x/time v0.3.0 // indirect
127-
google.golang.org/appengine v1.6.7 // indirect
128127
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
129-
google.golang.org/grpc v1.59.0 // indirect
130-
google.golang.org/protobuf v1.33.0 // indirect
128+
google.golang.org/grpc v1.65.0 // indirect
129+
google.golang.org/protobuf v1.34.2 // indirect
131130
gopkg.in/inf.v0 v0.9.1 // indirect
132131
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
133132
gopkg.in/yaml.v2 v2.4.0 // indirect
@@ -182,3 +181,5 @@ replace (
182181
)
183182

184183
replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20260203155829-4e295fa517e1 // staging kubernetes
184+
185+
replace google.golang.org/grpc => github.com/openshift-sustaining/grpc-go v1.67.3-sec.1

etcd/go.sum

Lines changed: 1654 additions & 51 deletions
Large diffs are not rendered by default.

etcd/vendor/github.com/cespare/xxhash/v2/README.md

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

etcd/vendor/github.com/cespare/xxhash/v2/xxhash.go

Lines changed: 22 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

etcd/vendor/github.com/cespare/xxhash/v2/xxhash_asm.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

etcd/vendor/github.com/cespare/xxhash/v2/xxhash_other.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

etcd/vendor/github.com/cespare/xxhash/v2/xxhash_safe.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

etcd/vendor/github.com/cespare/xxhash/v2/xxhash_unsafe.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

etcd/vendor/github.com/go-logr/logr/README.md

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)