Skip to content

Commit b8e1c91

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #723 from openshift-bot/synchronize-upstream
NO-ISSUE: Synchronize From Upstream Repositories
2 parents c25e535 + 8dbfeb7 commit b8e1c91

Some content is hidden

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

67 files changed

+847
-920
lines changed

‎go.mod

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ require (
8282
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
8383
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
8484
github.com/fatih/color v1.15.0 // indirect
85-
github.com/felixge/httpsnoop v1.0.3 // indirect
85+
github.com/felixge/httpsnoop v1.0.4 // indirect
8686
github.com/fsnotify/fsnotify v1.7.0 // indirect
8787
github.com/fvbommel/sortorder v1.1.0 // indirect
8888
github.com/go-air/gini v1.0.4 // indirect
@@ -91,7 +91,7 @@ require (
9191
github.com/go-git/go-billy/v5 v5.5.0 // indirect
9292
github.com/go-git/go-git/v5 v5.11.0 // indirect
9393
github.com/go-gorp/gorp/v3 v3.0.5 // indirect
94-
github.com/go-jose/go-jose/v3 v3.0.1 // indirect
94+
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
9595
github.com/go-logr/stdr v1.2.2 // indirect
9696
github.com/go-logr/zapr v1.2.4 // indirect
9797
github.com/go-openapi/jsonpointer v0.19.6 // indirect
@@ -114,7 +114,7 @@ require (
114114
github.com/google/pprof v0.0.0-20230323073829-e72429f035bd // indirect
115115
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
116116
github.com/google/uuid v1.4.0 // indirect
117-
github.com/gorilla/mux v1.8.0 // indirect
117+
github.com/gorilla/mux v1.8.1 // indirect
118118
github.com/gosuri/uitable v0.0.4 // indirect
119119
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
120120
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
@@ -134,7 +134,7 @@ require (
134134
github.com/josharian/intern v1.0.0 // indirect
135135
github.com/json-iterator/go v1.1.12 // indirect
136136
github.com/kisielk/errcheck v1.5.0 // indirect
137-
github.com/klauspost/compress v1.17.3 // indirect
137+
github.com/klauspost/compress v1.17.4 // indirect
138138
github.com/klauspost/pgzip v1.2.6 // indirect
139139
github.com/kylelemons/godebug v1.1.0 // indirect
140140
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
@@ -193,27 +193,27 @@ require (
193193
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
194194
github.com/xlab/treeprint v1.2.0 // indirect
195195
github.com/zeebo/errs v1.3.0 // indirect
196-
go.etcd.io/bbolt v1.3.8 // indirect
196+
go.etcd.io/bbolt v1.3.9 // indirect
197197
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
198198
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
199199
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
200200
go.opencensus.io v0.24.0 // indirect
201201
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
202-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
203-
go.opentelemetry.io/otel v1.20.0 // indirect
204-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
205-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
206-
go.opentelemetry.io/otel/metric v1.20.0 // indirect
207-
go.opentelemetry.io/otel/sdk v1.20.0 // indirect
208-
go.opentelemetry.io/otel/trace v1.20.0 // indirect
202+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
203+
go.opentelemetry.io/otel v1.21.0 // indirect
204+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
205+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
206+
go.opentelemetry.io/otel/metric v1.21.0 // indirect
207+
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
208+
go.opentelemetry.io/otel/trace v1.21.0 // indirect
209209
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
210210
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
211211
go.uber.org/multierr v1.11.0 // indirect
212212
go.uber.org/zap v1.25.0 // indirect
213213
golang.org/x/crypto v0.21.0 // indirect
214214
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
215215
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
216-
golang.org/x/mod v0.14.0 // indirect
216+
golang.org/x/mod v0.16.0 // indirect
217217
golang.org/x/net v0.22.0 // indirect
218218
golang.org/x/oauth2 v0.14.0 // indirect
219219
golang.org/x/sync v0.6.0 // indirect

‎go.sum

Lines changed: 72 additions & 54 deletions
Large diffs are not rendered by default.

‎staging/operator-registry/go.mod

Lines changed: 35 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ require (
77
github.com/containerd/containerd v1.7.11
88
github.com/containers/common v0.57.1
99
github.com/containers/image/v5 v5.29.0
10+
github.com/distribution/distribution/v3 v3.0.0-alpha.1
11+
github.com/distribution/reference v0.5.0
1012
github.com/docker/cli v25.0.5+incompatible
11-
github.com/docker/distribution v2.8.3+incompatible
1213
github.com/golang-migrate/migrate/v4 v4.17.0
1314
github.com/golang/mock v1.6.0
1415
github.com/google/go-cmp v0.6.0
@@ -30,15 +31,15 @@ require (
3031
github.com/spf13/cobra v1.8.0
3132
github.com/spf13/pflag v1.0.5
3233
github.com/stretchr/testify v1.8.4
33-
go.etcd.io/bbolt v1.3.8
34-
golang.org/x/mod v0.14.0
34+
go.etcd.io/bbolt v1.3.9
35+
golang.org/x/mod v0.16.0
3536
golang.org/x/net v0.22.0
3637
golang.org/x/sync v0.6.0
3738
golang.org/x/sys v0.18.0
3839
golang.org/x/text v0.14.0
3940
google.golang.org/grpc v1.60.1
4041
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
41-
google.golang.org/protobuf v1.31.0
42+
google.golang.org/protobuf v1.33.0
4243
gopkg.in/yaml.v2 v2.4.0
4344
k8s.io/api v0.28.5
4445
k8s.io/apiextensions-apiserver v0.28.5
@@ -57,14 +58,11 @@ require (
5758
github.com/MakeNowJust/heredoc v1.0.0 // indirect
5859
github.com/Microsoft/go-winio v0.6.1 // indirect
5960
github.com/Microsoft/hcsshim v0.12.0-rc.1 // indirect
60-
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
6161
github.com/alessio/shellescape v1.4.1 // indirect
6262
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
6363
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
6464
github.com/beorn7/perks v1.0.1 // indirect
65-
github.com/bshuster-repo/logrus-logstash-hook v0.4.1 // indirect
66-
github.com/bugsnag/bugsnag-go v1.5.3 // indirect
67-
github.com/bugsnag/panicwrap v1.2.0 // indirect
65+
github.com/bshuster-repo/logrus-logstash-hook v1.0.0 // indirect
6866
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
6967
github.com/cespare/xxhash/v2 v2.2.0 // indirect
7068
github.com/containerd/cgroups/v3 v3.0.2 // indirect
@@ -75,29 +73,30 @@ require (
7573
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
7674
github.com/containers/ocicrypt v1.1.9 // indirect
7775
github.com/containers/storage v1.51.0 // indirect
76+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
7877
github.com/davecgh/go-spew v1.1.1 // indirect
78+
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
79+
github.com/docker/distribution v2.8.3+incompatible // indirect
7980
github.com/docker/docker v25.0.5+incompatible // indirect
8081
github.com/docker/docker-credential-helpers v0.8.0 // indirect
8182
github.com/docker/go-connections v0.4.0 // indirect
83+
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
8284
github.com/docker/go-metrics v0.0.1 // indirect
8385
github.com/docker/go-units v0.5.0 // indirect
84-
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
8586
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
8687
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
8788
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
88-
github.com/felixge/httpsnoop v1.0.3 // indirect
89-
github.com/garyburd/redigo v1.6.0 // indirect
89+
github.com/felixge/httpsnoop v1.0.4 // indirect
9090
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
9191
github.com/go-git/go-billy/v5 v5.5.0 // indirect
9292
github.com/go-git/go-git/v5 v5.11.0 // indirect
93-
github.com/go-jose/go-jose/v3 v3.0.1 // indirect
93+
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
9494
github.com/go-logr/logr v1.4.1 // indirect
9595
github.com/go-logr/stdr v1.2.2 // indirect
9696
github.com/go-openapi/jsonpointer v0.19.6 // indirect
9797
github.com/go-openapi/jsonreference v0.20.2 // indirect
9898
github.com/go-openapi/swag v0.22.4 // indirect
9999
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
100-
github.com/gofrs/uuid v3.3.0+incompatible // indirect
101100
github.com/gogo/protobuf v1.3.2 // indirect
102101
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
103102
github.com/golang/protobuf v1.5.3 // indirect
@@ -107,18 +106,19 @@ require (
107106
github.com/google/pprof v0.0.0-20230323073829-e72429f035bd // indirect
108107
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
109108
github.com/google/uuid v1.4.0 // indirect
110-
github.com/gorilla/handlers v1.4.2 // indirect
111-
github.com/gorilla/mux v1.8.0 // indirect
109+
github.com/gorilla/handlers v1.5.2 // indirect
110+
github.com/gorilla/mux v1.8.1 // indirect
112111
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
113112
github.com/hashicorp/errwrap v1.1.0 // indirect
114113
github.com/hashicorp/go-multierror v1.1.1 // indirect
114+
github.com/hashicorp/golang-lru/arc/v2 v2.0.5 // indirect
115+
github.com/hashicorp/golang-lru/v2 v2.0.5 // indirect
115116
github.com/imdario/mergo v0.3.13 // indirect
116117
github.com/inconshreveable/mousetrap v1.1.0 // indirect
117118
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
118119
github.com/josharian/intern v1.0.0 // indirect
119120
github.com/json-iterator/go v1.1.12 // indirect
120-
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
121-
github.com/klauspost/compress v1.17.3 // indirect
121+
github.com/klauspost/compress v1.17.4 // indirect
122122
github.com/klauspost/pgzip v1.2.6 // indirect
123123
github.com/mailru/easyjson v0.7.7 // indirect
124124
github.com/mattn/go-isatty v0.0.17 // indirect
@@ -140,24 +140,32 @@ require (
140140
github.com/prometheus/client_model v0.5.0 // indirect
141141
github.com/prometheus/common v0.44.0 // indirect
142142
github.com/prometheus/procfs v0.11.1 // indirect
143+
github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 // indirect
144+
github.com/redis/go-redis/extra/redisotel/v9 v9.0.5 // indirect
145+
github.com/redis/go-redis/v9 v9.1.0 // indirect
143146
github.com/russross/blackfriday/v2 v2.1.0 // indirect
144147
github.com/spiffe/go-spiffe/v2 v2.1.6 // indirect
145148
github.com/stoewer/go-strcase v1.2.0 // indirect
146149
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
147150
github.com/ulikunitz/xz v0.5.11 // indirect
148151
github.com/vbatts/tar-split v0.11.5 // indirect
149-
github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 // indirect
150-
github.com/yvasiyarov/gorelic v0.0.7 // indirect
151-
github.com/yvasiyarov/newrelic_platform_go v0.0.0-20160601141957-9c099fbc30e9 // indirect
152152
github.com/zeebo/errs v1.3.0 // indirect
153153
go.opencensus.io v0.24.0 // indirect
154-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
155-
go.opentelemetry.io/otel v1.20.0 // indirect
156-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
157-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
158-
go.opentelemetry.io/otel/metric v1.20.0 // indirect
159-
go.opentelemetry.io/otel/sdk v1.20.0 // indirect
160-
go.opentelemetry.io/otel/trace v1.20.0 // indirect
154+
go.opentelemetry.io/contrib/exporters/autoexport v0.46.1 // indirect
155+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
156+
go.opentelemetry.io/otel v1.21.0 // indirect
157+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.44.0 // indirect
158+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.44.0 // indirect
159+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
160+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
161+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 // indirect
162+
go.opentelemetry.io/otel/exporters/prometheus v0.44.0 // indirect
163+
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.44.0 // indirect
164+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0 // indirect
165+
go.opentelemetry.io/otel/metric v1.21.0 // indirect
166+
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
167+
go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect
168+
go.opentelemetry.io/otel/trace v1.21.0 // indirect
161169
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
162170
golang.org/x/crypto v0.21.0 // indirect
163171
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
@@ -181,6 +189,3 @@ require (
181189
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
182190
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
183191
)
184-
185-
// latest tag resolves to a very old version. this is only used for spinning up local test registries
186-
replace github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d

0 commit comments

Comments
 (0)