Skip to content

Commit e45e646

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #763 from openshift-bot/synchronize-upstream
NO-ISSUE: Synchronize From Upstream Repositories
2 parents c2b6bb1 + 54197c3 commit e45e646

File tree

335 files changed

+8719
-35850
lines changed

Some content is hidden

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

335 files changed

+8719
-35850
lines changed

‎go.mod

Lines changed: 36 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ require (
1313
github.com/grpc-ecosystem/grpc-health-probe v0.4.26
1414
github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1
1515
github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37
16-
github.com/onsi/ginkgo/v2 v2.17.3
16+
github.com/onsi/ginkgo/v2 v2.19.0
1717
github.com/openshift/api v3.9.0+incompatible
18-
github.com/operator-framework/api v0.23.0
18+
github.com/operator-framework/api v0.25.0
1919
github.com/operator-framework/operator-lifecycle-manager v0.0.0-00010101000000-000000000000
20-
github.com/operator-framework/operator-registry v1.41.0
20+
github.com/operator-framework/operator-registry v1.43.1
2121
github.com/sirupsen/logrus v1.9.3
2222
github.com/spf13/cobra v1.8.0
2323
github.com/stretchr/testify v1.9.0
@@ -58,8 +58,8 @@ require (
5858
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
5959
github.com/Masterminds/squirrel v1.5.4 // indirect
6060
github.com/Masterminds/vcs v1.13.3 // indirect
61-
github.com/Microsoft/go-winio v0.6.1 // indirect
62-
github.com/Microsoft/hcsshim v0.12.0-rc.3 // indirect
61+
github.com/Microsoft/go-winio v0.6.2 // indirect
62+
github.com/Microsoft/hcsshim v0.12.3 // indirect
6363
github.com/NYTimes/gziphandler v1.1.1 // indirect
6464
github.com/akrylysov/pogreb v0.10.2 // indirect
6565
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
@@ -68,33 +68,33 @@ require (
6868
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
6969
github.com/cespare/xxhash/v2 v2.2.0 // indirect
7070
github.com/chai2010/gettext-go v1.0.2 // indirect
71-
github.com/containerd/cgroups/v3 v3.0.2 // indirect
72-
github.com/containerd/containerd v1.7.16 // indirect
71+
github.com/containerd/cgroups/v3 v3.0.3 // indirect
72+
github.com/containerd/containerd v1.7.17 // indirect
7373
github.com/containerd/continuity v0.4.2 // indirect
7474
github.com/containerd/errdefs v0.1.0 // indirect
7575
github.com/containerd/log v0.1.0 // indirect
76-
github.com/containerd/ttrpc v1.2.3 // indirect
76+
github.com/containerd/ttrpc v1.2.4 // indirect
7777
github.com/containerd/typeurl/v2 v2.1.1 // indirect
78-
github.com/containers/common v0.58.2 // indirect
79-
github.com/containers/image/v5 v5.30.1 // indirect
78+
github.com/containers/common v0.59.0 // indirect
79+
github.com/containers/image/v5 v5.31.0 // indirect
8080
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
81-
github.com/containers/ocicrypt v1.1.9 // indirect
82-
github.com/containers/storage v1.53.0 // indirect
81+
github.com/containers/ocicrypt v1.1.10 // indirect
82+
github.com/containers/storage v1.54.0 // indirect
8383
github.com/coreos/go-semver v0.3.1 // indirect
8484
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
8585
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
86-
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
87-
github.com/davecgh/go-spew v1.1.1 // indirect
86+
github.com/cyphar/filepath-securejoin v0.2.5 // indirect
87+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8888
github.com/distribution/reference v0.6.0 // indirect
89-
github.com/docker/cli v26.1.2+incompatible // indirect
89+
github.com/docker/cli v26.1.3+incompatible // indirect
9090
github.com/docker/distribution v2.8.3+incompatible // indirect
91-
github.com/docker/docker v25.0.5+incompatible // indirect
91+
github.com/docker/docker v26.1.3+incompatible // indirect
9292
github.com/docker/docker-credential-helpers v0.8.1 // indirect
9393
github.com/docker/go-connections v0.5.0 // indirect
9494
github.com/docker/go-metrics v0.0.1 // indirect
9595
github.com/docker/go-units v0.5.0 // indirect
9696
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
97-
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
97+
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
9898
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
9999
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
100100
github.com/fatih/color v1.17.0 // indirect
@@ -110,9 +110,9 @@ require (
110110
github.com/go-jose/go-jose/v4 v4.0.1 // indirect
111111
github.com/go-logr/stdr v1.2.2 // indirect
112112
github.com/go-logr/zapr v1.3.0 // indirect
113-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
114-
github.com/go-openapi/jsonreference v0.20.4 // indirect
115-
github.com/go-openapi/swag v0.22.10 // indirect
113+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
114+
github.com/go-openapi/jsonreference v0.21.0 // indirect
115+
github.com/go-openapi/swag v0.23.0 // indirect
116116
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
117117
github.com/gobuffalo/flect v1.0.2 // indirect
118118
github.com/gobwas/glob v0.2.3 // indirect
@@ -143,16 +143,15 @@ require (
143143
github.com/huandu/xstrings v1.4.0 // indirect
144144
github.com/imdario/mergo v0.3.16 // indirect
145145
github.com/inconshreveable/mousetrap v1.1.0 // indirect
146-
github.com/itchyny/gojq v0.12.15 // indirect
147-
github.com/itchyny/timefmt-go v0.1.5 // indirect
146+
github.com/itchyny/gojq v0.12.16 // indirect
147+
github.com/itchyny/timefmt-go v0.1.6 // indirect
148148
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
149149
github.com/jmoiron/sqlx v1.3.5 // indirect
150150
github.com/joelanford/ignore v0.1.0 // indirect
151151
github.com/josharian/intern v1.0.0 // indirect
152152
github.com/json-iterator/go v1.1.12 // indirect
153153
github.com/kisielk/errcheck v1.7.0 // indirect
154-
github.com/klauspost/compress v1.17.7 // indirect
155-
github.com/klauspost/pgzip v1.2.6 // indirect
154+
github.com/klauspost/compress v1.17.8 // indirect
156155
github.com/kylelemons/godebug v1.1.0 // indirect
157156
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
158157
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
@@ -187,10 +186,10 @@ require (
187186
github.com/otiai10/copy v1.14.0 // indirect
188187
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
189188
github.com/pkg/errors v0.9.1 // indirect
190-
github.com/pmezard/go-difflib v1.0.0 // indirect
191-
github.com/prometheus/client_golang v1.18.0 // indirect
189+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
190+
github.com/prometheus/client_golang v1.19.0 // indirect
192191
github.com/prometheus/client_model v0.6.1 // indirect
193-
github.com/prometheus/common v0.47.0 // indirect
192+
github.com/prometheus/common v0.51.1 // indirect
194193
github.com/prometheus/procfs v0.12.0 // indirect
195194
github.com/rivo/uniseg v0.4.7 // indirect
196195
github.com/rubenv/sql-migrate v1.5.2 // indirect
@@ -202,8 +201,6 @@ require (
202201
github.com/stoewer/go-strcase v1.3.0 // indirect
203202
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
204203
github.com/tidwall/btree v1.7.0 // indirect
205-
github.com/ulikunitz/xz v0.5.11 // indirect
206-
github.com/vbatts/tar-split v0.11.5 // indirect
207204
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
208205
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
209206
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
@@ -215,23 +212,23 @@ require (
215212
go.etcd.io/etcd/client/v3 v3.5.12 // indirect
216213
go.opencensus.io v0.24.0 // indirect
217214
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 // indirect
218-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 // indirect
219-
go.opentelemetry.io/otel v1.23.1 // indirect
215+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
216+
go.opentelemetry.io/otel v1.24.0 // indirect
220217
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.1 // indirect
221218
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.23.1 // indirect
222-
go.opentelemetry.io/otel/metric v1.23.1 // indirect
219+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
223220
go.opentelemetry.io/otel/sdk v1.23.1 // indirect
224-
go.opentelemetry.io/otel/trace v1.23.1 // indirect
221+
go.opentelemetry.io/otel/trace v1.24.0 // indirect
225222
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
226223
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
227224
go.uber.org/multierr v1.11.0 // indirect
228225
go.uber.org/zap v1.26.0 // indirect
229226
golang.org/x/crypto v0.23.0 // indirect
230-
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
227+
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
231228
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
232229
golang.org/x/mod v0.17.0 // indirect
233230
golang.org/x/net v0.25.0 // indirect
234-
golang.org/x/oauth2 v0.18.0 // indirect
231+
golang.org/x/oauth2 v0.20.0 // indirect
235232
golang.org/x/sync v0.7.0 // indirect
236233
golang.org/x/sys v0.20.0 // indirect
237234
golang.org/x/term v0.20.0 // indirect
@@ -240,26 +237,25 @@ require (
240237
golang.org/x/tools v0.21.0 // indirect
241238
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
242239
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
243-
google.golang.org/appengine v1.6.8 // indirect
244240
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
245-
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
241+
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
246242
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
247-
google.golang.org/grpc v1.63.2 // indirect
243+
google.golang.org/grpc v1.64.0 // indirect
248244
gopkg.in/inf.v0 v0.9.1 // indirect
249245
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
250246
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
251247
gopkg.in/warnings.v0 v0.1.2 // indirect
252248
gopkg.in/yaml.v3 v3.0.1 // indirect
253249
k8s.io/apiextensions-apiserver v0.30.1 // indirect
254250
k8s.io/apiserver v0.30.1 // indirect
255-
k8s.io/cli-runtime v0.29.3 // indirect
251+
k8s.io/cli-runtime v0.30.0 // indirect
256252
k8s.io/component-base v0.30.1 // indirect
257253
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
258254
k8s.io/klog v1.0.0 // indirect
259255
k8s.io/klog/v2 v2.120.1 // indirect
260256
k8s.io/kms v0.30.1 // indirect
261257
k8s.io/kube-aggregator v0.30.1 // indirect
262-
k8s.io/kubectl v0.29.3 // indirect
258+
k8s.io/kubectl v0.30.0 // indirect
263259
oras.land/oras-go v1.2.5 // indirect
264260
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
265261
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

0 commit comments

Comments
 (0)