Skip to content

Commit fe25418

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #848 from perdasilva/perdasilva/fix-sync/0902
OCPBUGS-36661,OCPBUGS-37819: Synchronize From Upstream Repositories
2 parents 7915649 + dbb5513 commit fe25418

File tree

2,490 files changed

+95230
-63346
lines changed

Some content is hidden

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

2,490 files changed

+95230
-63346
lines changed

‎go.mod

Lines changed: 62 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,35 @@
11
module github.com/openshift/operator-framework-olm
22

3-
go 1.22.0
4-
5-
toolchain go1.22.3
3+
go 1.22.5
64

75
require (
86
github.com/blang/semver/v4 v4.0.0
97
github.com/go-bindata/go-bindata/v3 v3.1.3
108
github.com/go-logr/logr v1.4.2
119
github.com/golang/mock v1.6.0
1210
github.com/googleapis/gnostic v0.5.5
13-
github.com/grpc-ecosystem/grpc-health-probe v0.4.29
11+
github.com/grpc-ecosystem/grpc-health-probe v0.4.31
1412
github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1
1513
github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37
1614
github.com/onsi/ginkgo/v2 v2.20.0
1715
github.com/openshift/api v3.9.0+incompatible
1816
github.com/operator-framework/api v0.26.0
1917
github.com/operator-framework/operator-lifecycle-manager v0.0.0-00010101000000-000000000000
20-
github.com/operator-framework/operator-registry v1.45.0
18+
github.com/operator-framework/operator-registry v1.46.0
2119
github.com/sirupsen/logrus v1.9.3
2220
github.com/spf13/cobra v1.8.1
2321
github.com/stretchr/testify v1.9.0
24-
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.4.0
22+
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
2523
google.golang.org/protobuf v1.34.2
2624
gopkg.in/yaml.v2 v2.4.0
27-
k8s.io/api v0.30.3
28-
k8s.io/apimachinery v0.30.3
29-
k8s.io/client-go v0.30.3
30-
k8s.io/code-generator v0.30.3
31-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
32-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
33-
sigs.k8s.io/controller-runtime v0.18.5
34-
sigs.k8s.io/controller-tools v0.15.0
35-
)
36-
37-
// pin to v1.18.0 until k8s.io/component-base updates its prometheus dependencies
38-
// issue: https://github.com/operator-framework/operator-lifecycle-manager/issues/3283
39-
replace (
40-
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.18.0
41-
github.com/prometheus/common => github.com/prometheus/common v0.47.0
25+
k8s.io/api v0.31.0
26+
k8s.io/apimachinery v0.31.0
27+
k8s.io/client-go v0.31.0
28+
k8s.io/code-generator v0.31.0
29+
k8s.io/kube-openapi v0.0.0-20240816214639-573285566f34
30+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
31+
sigs.k8s.io/controller-runtime v0.19.0
32+
sigs.k8s.io/controller-tools v0.16.1
4233
)
4334

4435
// latest gRPC library causes changes in the way the CatalogSource connection status behaves
@@ -50,52 +41,53 @@ replace google.golang.org/grpc => google.golang.org/grpc v1.63.2
5041
require (
5142
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
5243
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
53-
github.com/BurntSushi/toml v1.3.2 // indirect
44+
github.com/BurntSushi/toml v1.4.0 // indirect
5445
github.com/MakeNowJust/heredoc v1.0.0 // indirect
5546
github.com/Microsoft/go-winio v0.6.2 // indirect
56-
github.com/Microsoft/hcsshim v0.12.3 // indirect
47+
github.com/Microsoft/hcsshim v0.12.5 // indirect
5748
github.com/NYTimes/gziphandler v1.1.1 // indirect
5849
github.com/akrylysov/pogreb v0.10.2 // indirect
59-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230512164433-5d1fd1a340c9 // indirect
50+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
6051
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
6152
github.com/beorn7/perks v1.0.1 // indirect
62-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
53+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
6354
github.com/cespare/xxhash/v2 v2.3.0 // indirect
6455
github.com/containerd/cgroups/v3 v3.0.3 // indirect
65-
github.com/containerd/containerd v1.7.19 // indirect
56+
github.com/containerd/containerd v1.7.20 // indirect
6657
github.com/containerd/containerd/api v1.7.19 // indirect
6758
github.com/containerd/continuity v0.4.2 // indirect
6859
github.com/containerd/errdefs v0.1.0 // indirect
6960
github.com/containerd/log v0.1.0 // indirect
7061
github.com/containerd/platforms v0.2.1 // indirect
7162
github.com/containerd/ttrpc v1.2.5 // indirect
7263
github.com/containerd/typeurl/v2 v2.1.1 // indirect
73-
github.com/containers/common v0.59.2 // indirect
74-
github.com/containers/image/v5 v5.31.1 // indirect
64+
github.com/containers/common v0.60.1 // indirect
65+
github.com/containers/image/v5 v5.32.1 // indirect
7566
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
76-
github.com/containers/ocicrypt v1.1.10 // indirect
77-
github.com/containers/storage v1.54.0 // indirect
67+
github.com/containers/ocicrypt v1.2.0 // indirect
68+
github.com/containers/storage v1.55.0 // indirect
7869
github.com/coreos/go-semver v0.3.1 // indirect
7970
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
8071
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8172
github.com/distribution/reference v0.6.0 // indirect
82-
github.com/docker/cli v27.0.3+incompatible // indirect
73+
github.com/docker/cli v27.1.2+incompatible // indirect
8374
github.com/docker/distribution v2.8.3+incompatible // indirect
84-
github.com/docker/docker v26.1.5+incompatible // indirect
85-
github.com/docker/docker-credential-helpers v0.8.1 // indirect
75+
github.com/docker/docker v27.1.1+incompatible // indirect
76+
github.com/docker/docker-credential-helpers v0.8.2 // indirect
8677
github.com/docker/go-connections v0.5.0 // indirect
8778
github.com/docker/go-units v0.5.0 // indirect
88-
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
79+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
8980
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
9081
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
9182
github.com/fatih/color v1.17.0 // indirect
9283
github.com/felixge/httpsnoop v1.0.4 // indirect
9384
github.com/fsnotify/fsnotify v1.7.0 // indirect
85+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
9486
github.com/go-air/gini v1.0.4 // indirect
9587
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
9688
github.com/go-git/go-billy/v5 v5.5.0 // indirect
9789
github.com/go-git/go-git/v5 v5.11.0 // indirect
98-
github.com/go-jose/go-jose/v4 v4.0.1 // indirect
90+
github.com/go-jose/go-jose/v4 v4.0.2 // indirect
9991
github.com/go-logr/stdr v1.2.2 // indirect
10092
github.com/go-logr/zapr v1.3.0 // indirect
10193
github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -108,7 +100,7 @@ require (
108100
github.com/golang-migrate/migrate/v4 v4.17.1 // indirect
109101
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
110102
github.com/golang/protobuf v1.5.4 // indirect
111-
github.com/google/cel-go v0.17.8 // indirect
103+
github.com/google/cel-go v0.20.1 // indirect
112104
github.com/google/gnostic-models v0.6.8 // indirect
113105
github.com/google/go-cmp v0.6.0 // indirect
114106
github.com/google/gofuzz v1.2.0 // indirect
@@ -118,7 +110,7 @@ require (
118110
github.com/gorilla/websocket v1.5.0 // indirect
119111
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect
120112
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
121-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
113+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
122114
github.com/h2non/filetype v1.1.3 // indirect
123115
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
124116
github.com/imdario/mergo v0.3.16 // indirect
@@ -130,7 +122,7 @@ require (
130122
github.com/josharian/intern v1.0.0 // indirect
131123
github.com/json-iterator/go v1.1.12 // indirect
132124
github.com/kisielk/errcheck v1.7.0 // indirect
133-
github.com/klauspost/compress v1.17.8 // indirect
125+
github.com/klauspost/compress v1.17.9 // indirect
134126
github.com/kylelemons/godebug v1.1.0 // indirect
135127
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
136128
github.com/mailru/easyjson v0.7.7 // indirect
@@ -141,10 +133,10 @@ require (
141133
github.com/mitchellh/hashstructure v1.1.0 // indirect
142134
github.com/mitchellh/mapstructure v1.5.0 // indirect
143135
github.com/moby/locker v1.0.1 // indirect
144-
github.com/moby/spdystream v0.2.0 // indirect
145-
github.com/moby/sys/mountinfo v0.7.1 // indirect
136+
github.com/moby/spdystream v0.4.0 // indirect
137+
github.com/moby/sys/mountinfo v0.7.2 // indirect
146138
github.com/moby/sys/sequential v0.5.0 // indirect
147-
github.com/moby/sys/user v0.1.0 // indirect
139+
github.com/moby/sys/user v0.2.0 // indirect
148140
github.com/moby/term v0.5.0 // indirect
149141
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
150142
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -159,41 +151,42 @@ require (
159151
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 // indirect
160152
github.com/pkg/errors v0.9.1 // indirect
161153
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
162-
github.com/prometheus/client_golang v1.19.0 // indirect
154+
github.com/prometheus/client_golang v1.19.1 // indirect
163155
github.com/prometheus/client_model v0.6.1 // indirect
164-
github.com/prometheus/common v0.51.1 // indirect
165-
github.com/prometheus/procfs v0.12.0 // indirect
156+
github.com/prometheus/common v0.55.0 // indirect
157+
github.com/prometheus/procfs v0.15.1 // indirect
166158
github.com/russross/blackfriday/v2 v2.1.0 // indirect
167159
github.com/spf13/pflag v1.0.5 // indirect
168-
github.com/spiffe/go-spiffe/v2 v2.2.0 // indirect
160+
github.com/spiffe/go-spiffe/v2 v2.3.0 // indirect
169161
github.com/stoewer/go-strcase v1.3.0 // indirect
170162
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
171163
github.com/tidwall/btree v1.7.0 // indirect
164+
github.com/x448/float16 v0.8.4 // indirect
172165
github.com/zeebo/errs v1.3.0 // indirect
173166
go.etcd.io/bbolt v1.3.10 // indirect
174-
go.etcd.io/etcd/api/v3 v3.5.12 // indirect
175-
go.etcd.io/etcd/client/pkg/v3 v3.5.12 // indirect
176-
go.etcd.io/etcd/client/v3 v3.5.12 // indirect
167+
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
168+
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
169+
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
177170
go.opencensus.io v0.24.0 // indirect
178-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 // indirect
179-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
180-
go.opentelemetry.io/otel v1.24.0 // indirect
181-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.1 // indirect
182-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.23.1 // indirect
183-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
184-
go.opentelemetry.io/otel/sdk v1.23.1 // indirect
185-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
186-
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
171+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
172+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
173+
go.opentelemetry.io/otel v1.28.0 // indirect
174+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
175+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
176+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
177+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
178+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
179+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
187180
go.uber.org/multierr v1.11.0 // indirect
188181
go.uber.org/zap v1.26.0 // indirect
189182
golang.org/x/crypto v0.26.0 // indirect
190183
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
191184
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
192185
golang.org/x/mod v0.20.0 // indirect
193186
golang.org/x/net v0.28.0 // indirect
194-
golang.org/x/oauth2 v0.20.0 // indirect
187+
golang.org/x/oauth2 v0.22.0 // indirect
195188
golang.org/x/sync v0.8.0 // indirect
196-
golang.org/x/sys v0.23.0 // indirect
189+
golang.org/x/sys v0.24.0 // indirect
197190
golang.org/x/term v0.23.0 // indirect
198191
golang.org/x/text v0.17.0 // indirect
199192
golang.org/x/time v0.6.0 // indirect
@@ -202,24 +195,25 @@ require (
202195
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
203196
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
204197
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
205-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
198+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
206199
google.golang.org/grpc v1.65.0 // indirect
200+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
207201
gopkg.in/inf.v0 v0.9.1 // indirect
208202
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
209203
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
210204
gopkg.in/warnings.v0 v0.1.2 // indirect
211205
gopkg.in/yaml.v3 v3.0.1 // indirect
212-
k8s.io/apiextensions-apiserver v0.30.3 // indirect
213-
k8s.io/apiserver v0.30.3 // indirect
206+
k8s.io/apiextensions-apiserver v0.31.0 // indirect
207+
k8s.io/apiserver v0.31.0 // indirect
214208
k8s.io/cli-runtime v0.30.0 // indirect
215-
k8s.io/component-base v0.30.3 // indirect
216-
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
209+
k8s.io/component-base v0.31.0 // indirect
210+
k8s.io/gengo/v2 v2.0.0-20240812201722-3b05ca7b6e59 // indirect
217211
k8s.io/klog v1.0.0 // indirect
218-
k8s.io/klog/v2 v2.120.1 // indirect
219-
k8s.io/kms v0.30.3 // indirect
220-
k8s.io/kube-aggregator v0.30.3 // indirect
212+
k8s.io/klog/v2 v2.130.1 // indirect
213+
k8s.io/kms v0.31.0 // indirect
214+
k8s.io/kube-aggregator v0.31.0 // indirect
221215
k8s.io/kubectl v0.30.0 // indirect
222-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
216+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
223217
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
224218
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
225219
sigs.k8s.io/yaml v1.4.0 // indirect

0 commit comments

Comments
 (0)