Skip to content

Commit c6ef935

Browse files
camilamacedo86camilamacedo86
authored
🌱 Upgrade github.com/operator-framework/operator-registry from 1.51.0 to 1.53.0 (#3562)
* Upgrade github.com/operator-framework/operator-registry from 1.51.0 to 1.53.0 * Update manifests after upgrade operator-registry from v0.51.0 to v0.53.0
1 parent 96d20bc commit c6ef935

File tree

189 files changed

+15539
-6364
lines changed

Some content is hidden

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

189 files changed

+15539
-6364
lines changed

‎deploy/chart/crds/0000_50_olm_00-catalogsources.crd.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -975,11 +975,10 @@ spec:
975975
configured to use *must* be using the file-based catalogs in order to utilize this feature.
976976
type: object
977977
required:
978-
- cacheDir
979978
- catalogDir
980979
properties:
981980
cacheDir:
982-
description: CacheDir is the directory storing the pre-calculated API cache.
981+
description: CacheDir is the (optional) directory storing the pre-calculated API cache.
983982
type: string
984983
catalogDir:
985984
description: CatalogDir is the directory storing the file-based catalog contents.

‎go.mod

+44-39
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
module github.com/operator-framework/operator-lifecycle-manager
22

3-
go 1.23.0
4-
5-
toolchain go1.23.4
3+
go 1.23.6
64

75
require (
86
github.com/blang/semver/v4 v4.0.0
9-
github.com/containers/image/v5 v5.34.2
7+
github.com/containers/image/v5 v5.35.0
108
github.com/coreos/go-semver v0.3.1
119
github.com/distribution/reference v0.6.0
1210
github.com/evanphx/json-patch v5.9.11+incompatible
@@ -20,12 +18,12 @@ require (
2018
github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2
2119
github.com/mitchellh/hashstructure v1.1.0
2220
github.com/mitchellh/mapstructure v1.5.0
23-
github.com/onsi/ginkgo/v2 v2.23.3
21+
github.com/onsi/ginkgo/v2 v2.23.4
2422
github.com/onsi/gomega v1.37.0
2523
github.com/openshift/api v3.9.0+incompatible
2624
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a
27-
github.com/operator-framework/api v0.30.0
28-
github.com/operator-framework/operator-registry v1.51.0
25+
github.com/operator-framework/api v0.31.0
26+
github.com/operator-framework/operator-registry v1.53.0
2927
github.com/otiai10/copy v1.14.1
3028
github.com/pkg/errors v0.9.1
3129
github.com/prometheus/client_golang v1.21.1
@@ -38,7 +36,7 @@ require (
3836
golang.org/x/net v0.39.0
3937
golang.org/x/sync v0.13.0
4038
golang.org/x/time v0.11.0
41-
google.golang.org/grpc v1.70.0
39+
google.golang.org/grpc v1.72.0
4240
gopkg.in/yaml.v2 v2.4.0
4341
k8s.io/api v0.32.3
4442
k8s.io/apiextensions-apiserver v0.32.3
@@ -56,9 +54,9 @@ require (
5654
)
5755

5856
require (
59-
cel.dev/expr v0.19.0 // indirect
57+
cel.dev/expr v0.20.0 // indirect
6058
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
61-
github.com/BurntSushi/toml v1.4.0 // indirect
59+
github.com/BurntSushi/toml v1.5.0 // indirect
6260
github.com/Microsoft/go-winio v0.6.2 // indirect
6361
github.com/Microsoft/hcsshim v0.12.9 // indirect
6462
github.com/NYTimes/gziphandler v1.1.1 // indirect
@@ -67,7 +65,7 @@ require (
6765
github.com/beorn7/perks v1.0.1 // indirect
6866
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
6967
github.com/cespare/xxhash/v2 v2.3.0 // indirect
70-
github.com/containerd/cgroups/v3 v3.0.3 // indirect
68+
github.com/containerd/cgroups/v3 v3.0.5 // indirect
7169
github.com/containerd/containerd v1.7.27 // indirect
7270
github.com/containerd/containerd/api v1.8.0 // indirect
7371
github.com/containerd/continuity v0.4.4 // indirect
@@ -77,16 +75,16 @@ require (
7775
github.com/containerd/platforms v0.2.1 // indirect
7876
github.com/containerd/ttrpc v1.2.7 // indirect
7977
github.com/containerd/typeurl/v2 v2.2.3 // indirect
80-
github.com/containers/common v0.62.0 // indirect
78+
github.com/containers/common v0.63.0 // indirect
8179
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
8280
github.com/containers/ocicrypt v1.2.1 // indirect
83-
github.com/containers/storage v1.57.2 // indirect
81+
github.com/containers/storage v1.58.0 // indirect
8482
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
8583
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
86-
github.com/docker/cli v28.0.0+incompatible // indirect
84+
github.com/docker/cli v28.1.1+incompatible // indirect
8785
github.com/docker/distribution v2.8.3+incompatible // indirect
88-
github.com/docker/docker v27.5.1+incompatible // indirect
89-
github.com/docker/docker-credential-helpers v0.8.2 // indirect
86+
github.com/docker/docker v28.0.4+incompatible // indirect
87+
github.com/docker/docker-credential-helpers v0.9.3 // indirect
9088
github.com/docker/go-connections v0.5.0 // indirect
9189
github.com/docker/go-units v0.5.0 // indirect
9290
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
@@ -98,46 +96,46 @@ require (
9896
github.com/go-logr/zapr v1.3.0 // indirect
9997
github.com/go-openapi/jsonpointer v0.21.0 // indirect
10098
github.com/go-openapi/jsonreference v0.21.0 // indirect
101-
github.com/go-openapi/swag v0.23.0 // indirect
99+
github.com/go-openapi/swag v0.23.1 // indirect
102100
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
103101
github.com/gobuffalo/flect v1.0.3 // indirect
104102
github.com/gogo/protobuf v1.3.2 // indirect
105103
github.com/golang-migrate/migrate/v4 v4.18.2 // indirect
106-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
104+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
107105
github.com/golang/protobuf v1.5.4 // indirect
108106
github.com/google/btree v1.1.3 // indirect
109-
github.com/google/cel-go v0.22.1 // indirect
107+
github.com/google/cel-go v0.23.0 // indirect
110108
github.com/google/gnostic-models v0.6.8 // indirect
111109
github.com/google/gofuzz v1.2.0 // indirect
112-
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
110+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
113111
github.com/google/uuid v1.6.0 // indirect
114112
github.com/gorilla/mux v1.8.1 // indirect
115113
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
116-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
114+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
117115
github.com/h2non/filetype v1.1.3 // indirect
118116
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
119117
github.com/inconshreveable/mousetrap v1.1.0 // indirect
120118
github.com/itchyny/timefmt-go v0.1.6 // indirect
121119
github.com/josharian/intern v1.0.0 // indirect
122120
github.com/json-iterator/go v1.1.12 // indirect
123-
github.com/klauspost/compress v1.17.11 // indirect
121+
github.com/klauspost/compress v1.18.0 // indirect
124122
github.com/kylelemons/godebug v1.1.0 // indirect
125-
github.com/mailru/easyjson v0.7.7 // indirect
123+
github.com/mailru/easyjson v0.9.0 // indirect
126124
github.com/mattn/go-colorable v0.1.13 // indirect
127125
github.com/mattn/go-isatty v0.0.20 // indirect
128-
github.com/mattn/go-sqlite3 v1.14.24 // indirect
126+
github.com/mattn/go-sqlite3 v1.14.28 // indirect
129127
github.com/moby/locker v1.0.1 // indirect
130128
github.com/moby/sys/capability v0.4.0 // indirect
131129
github.com/moby/sys/mountinfo v0.7.2 // indirect
132130
github.com/moby/sys/sequential v0.5.0 // indirect
133-
github.com/moby/sys/user v0.3.0 // indirect
131+
github.com/moby/sys/user v0.4.0 // indirect
134132
github.com/moby/sys/userns v0.1.0 // indirect
135133
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
136134
github.com/modern-go/reflect2 v1.0.2 // indirect
137135
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
138136
github.com/opencontainers/go-digest v1.0.0 // indirect
139-
github.com/opencontainers/image-spec v1.1.0 // indirect
140-
github.com/opencontainers/runtime-spec v1.2.0 // indirect
137+
github.com/opencontainers/image-spec v1.1.1 // indirect
138+
github.com/opencontainers/runtime-spec v1.2.1 // indirect
141139
github.com/otiai10/mint v1.6.3 // indirect
142140
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
143141
github.com/prometheus/procfs v0.15.1 // indirect
@@ -148,29 +146,31 @@ require (
148146
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
149147
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
150148
go.opencensus.io v0.24.0 // indirect
149+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
151150
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
152-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect
153-
go.opentelemetry.io/otel v1.32.0 // indirect
154-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect
151+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
152+
go.opentelemetry.io/otel v1.34.0 // indirect
153+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
155154
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 // indirect
156-
go.opentelemetry.io/otel/metric v1.32.0 // indirect
157-
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
158-
go.opentelemetry.io/otel/trace v1.32.0 // indirect
159-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
155+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
156+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
157+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
158+
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
159+
go.uber.org/automaxprocs v1.6.0 // indirect
160160
go.uber.org/multierr v1.11.0 // indirect
161161
go.uber.org/zap v1.27.0 // indirect
162162
golang.org/x/crypto v0.37.0 // indirect
163163
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329 // indirect
164-
golang.org/x/mod v0.23.0 // indirect
165-
golang.org/x/oauth2 v0.28.0 // indirect
164+
golang.org/x/mod v0.24.0 // indirect
165+
golang.org/x/oauth2 v0.29.0 // indirect
166166
golang.org/x/sys v0.32.0 // indirect
167167
golang.org/x/term v0.31.0 // indirect
168168
golang.org/x/text v0.24.0 // indirect
169-
golang.org/x/tools v0.30.0 // indirect
169+
golang.org/x/tools v0.31.0 // indirect
170170
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
171-
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
171+
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect
172172
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
173-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e // indirect
173+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250422160041-2d3770c4ea7f // indirect
174174
google.golang.org/protobuf v1.36.6 // indirect
175175
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
176176
gopkg.in/inf.v0 v0.9.1 // indirect
@@ -189,6 +189,11 @@ require (
189189
// issue: https://github.com/operator-framework/operator-lifecycle-manager/issues/3284
190190
replace google.golang.org/grpc => google.golang.org/grpc v1.63.2
191191

192+
// cel-go v0.23.0 upgrade causes errors raised from the vendor source which lead to think in
193+
// incompatibilities scenarios. After upgrade to use the latest versions of k8s/api v0.33+
194+
// we should try to see if we could fix this one and remove this replace
195+
replace github.com/google/cel-go => github.com/google/cel-go v0.22.1
196+
192197
replace (
193198
// controller runtime
194199
github.com/openshift/api => github.com/openshift/api v0.0.0-20221021112143-4226c2167e40 // release-4.12

0 commit comments

Comments
 (0)