Skip to content

Commit 0081ef3

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request openshift#654 from dtfranz/sync-with-upstream
OCPBUGS-24526,OPRUN-3182: Sync with upstream
2 parents 743aeee + dc8c2a3 commit 0081ef3

File tree

204 files changed

+13290
-5746
lines changed

Some content is hidden

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

204 files changed

+13290
-5746
lines changed

‎go.mod

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ require (
3333
sigs.k8s.io/controller-tools v0.8.0
3434
)
3535

36-
replace google.golang.org/grpc => google.golang.org/grpc v1.40.0
37-
3836
require (
3937
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
4038
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
@@ -198,7 +196,7 @@ require (
198196
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
199197
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
200198
go.opencensus.io v0.24.0 // indirect
201-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.44.0 // indirect
199+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
202200
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
203201
go.opentelemetry.io/otel v1.20.0 // indirect
204202
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
@@ -216,20 +214,20 @@ require (
216214
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
217215
golang.org/x/mod v0.12.0 // indirect
218216
golang.org/x/net v0.19.0 // indirect
219-
golang.org/x/oauth2 v0.12.0 // indirect
220-
golang.org/x/sync v0.3.0 // indirect
217+
golang.org/x/oauth2 v0.13.0 // indirect
218+
golang.org/x/sync v0.4.0 // indirect
221219
golang.org/x/sys v0.15.0 // indirect
222220
golang.org/x/term v0.15.0 // indirect
223221
golang.org/x/text v0.14.0 // indirect
224222
golang.org/x/time v0.3.0 // indirect
225223
golang.org/x/tools v0.13.0 // indirect
226224
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
227225
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
228-
google.golang.org/appengine v1.6.7 // indirect
229-
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
230-
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
231-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
232-
google.golang.org/grpc v1.59.0 // indirect
226+
google.golang.org/appengine v1.6.8 // indirect
227+
google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect
228+
google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect
229+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
230+
google.golang.org/grpc v1.60.1 // indirect
233231
gopkg.in/inf.v0 v0.9.1 // indirect
234232
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
235233
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
@@ -256,9 +254,6 @@ require (
256254
)
257255

258256
replace (
259-
// latest tag resolves to a very old version. this is only used for spinning up local test registries
260-
github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
261-
262257
// controller runtime
263258
github.com/openshift/api => github.com/openshift/api v0.0.0-20210517065120-b325f58df679
264259
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0 // release-4.5
@@ -268,9 +263,6 @@ replace (
268263
github.com/operator-framework/operator-lifecycle-manager => ./staging/operator-lifecycle-manager
269264
github.com/operator-framework/operator-registry => ./staging/operator-registry
270265

271-
// this should be removeable once https://issues.redhat.com/browse/CLOUDBLD-11068 is resolved
272-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.0
273-
274266
// pinned because no tag supports 1.18 yet
275267
sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06
276268
)

‎go.sum

Lines changed: 62 additions & 66 deletions
Large diffs are not rendered by default.

‎staging/operator-lifecycle-manager/go.mod

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ require (
3636
github.com/spf13/pflag v1.0.5
3737
github.com/stretchr/testify v1.8.4
3838
golang.org/x/net v0.17.0
39-
golang.org/x/sync v0.3.0
39+
golang.org/x/sync v0.4.0
4040
golang.org/x/time v0.3.0
41-
google.golang.org/grpc v1.59.0
41+
google.golang.org/grpc v1.60.1
4242
gopkg.in/yaml.v2 v2.4.0
4343
helm.sh/helm/v3 v3.12.2
4444
k8s.io/api v0.27.7
@@ -58,8 +58,6 @@ require (
5858
sigs.k8s.io/kind v0.20.0
5959
)
6060

61-
replace google.golang.org/grpc => google.golang.org/grpc v1.40.0
62-
6361
require (
6462
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
6563
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
@@ -202,7 +200,7 @@ require (
202200
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
203201
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
204202
go.opencensus.io v0.24.0 // indirect
205-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.44.0 // indirect
203+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
206204
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
207205
go.opentelemetry.io/otel v1.20.0 // indirect
208206
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
@@ -219,17 +217,17 @@ require (
219217
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
220218
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
221219
golang.org/x/mod v0.12.0 // indirect
222-
golang.org/x/oauth2 v0.12.0 // indirect
220+
golang.org/x/oauth2 v0.13.0 // indirect
223221
golang.org/x/sys v0.14.0 // indirect
224222
golang.org/x/term v0.13.0 // indirect
225223
golang.org/x/text v0.13.0 // indirect
226224
golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
227225
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
228226
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
229-
google.golang.org/appengine v1.6.7 // indirect
230-
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
231-
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
232-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
227+
google.golang.org/appengine v1.6.8 // indirect
228+
google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect
229+
google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect
230+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
233231
google.golang.org/protobuf v1.31.0 // indirect
234232
gopkg.in/inf.v0 v0.9.1 // indirect
235233
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect

0 commit comments

Comments
 (0)