Skip to content

Commit a9bf0da

Browse files
perdasilvaPer Goncalves da Silva
and
Per Goncalves da Silva
authored
build(deps): bump github.com/operator-framework/operator-registry from v1.41 to v1.43.1 (#3282)
Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]>
1 parent f340322 commit a9bf0da

File tree

287 files changed

+6352
-35656
lines changed

Some content is hidden

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

287 files changed

+6352
-35656
lines changed

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

Lines changed: 59 additions & 25 deletions
Large diffs are not rendered by default.

deploy/chart/crds/0000_50_olm_00-clusterserviceversions.crd.yaml

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

deploy/chart/crds/0000_50_olm_00-installplans.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.14.0
5+
controller-gen.kubebuilder.io/version: v0.15.0
66
name: installplans.operators.coreos.com
77
spec:
88
group: operators.coreos.com

deploy/chart/crds/0000_50_olm_00-olmconfigs.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.14.0
5+
controller-gen.kubebuilder.io/version: v0.15.0
66
name: olmconfigs.operators.coreos.com
77
spec:
88
group: operators.coreos.com

deploy/chart/crds/0000_50_olm_00-operatorconditions.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.14.0
5+
controller-gen.kubebuilder.io/version: v0.15.0
66
name: operatorconditions.operators.coreos.com
77
spec:
88
group: operators.coreos.com

deploy/chart/crds/0000_50_olm_00-operatorgroups.crd.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.14.0
5+
controller-gen.kubebuilder.io/version: v0.15.0
66
name: operatorgroups.operators.coreos.com
77
spec:
88
group: operators.coreos.com
@@ -83,6 +83,8 @@ spec:
8383
type: array
8484
items:
8585
type: string
86+
x-kubernetes-list-type: atomic
87+
x-kubernetes-list-type: atomic
8688
matchLabels:
8789
description: |-
8890
matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
@@ -341,6 +343,8 @@ spec:
341343
type: array
342344
items:
343345
type: string
346+
x-kubernetes-list-type: atomic
347+
x-kubernetes-list-type: atomic
344348
matchLabels:
345349
description: |-
346350
matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels

deploy/chart/crds/0000_50_olm_00-operators.crd.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.14.0
5+
controller-gen.kubebuilder.io/version: v0.15.0
66
name: operators.operators.coreos.com
77
spec:
88
group: operators.coreos.com
@@ -84,6 +84,8 @@ spec:
8484
type: array
8585
items:
8686
type: string
87+
x-kubernetes-list-type: atomic
88+
x-kubernetes-list-type: atomic
8789
matchLabels:
8890
description: |-
8991
matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels

deploy/chart/crds/0000_50_olm_00-subscriptions.crd.yaml

Lines changed: 196 additions & 43 deletions
Large diffs are not rendered by default.

go.mod

Lines changed: 41 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,21 @@ require (
2323
github.com/onsi/gomega v1.33.1
2424
github.com/openshift/api v3.9.0+incompatible
2525
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a
26-
github.com/operator-framework/api v0.23.0
27-
github.com/operator-framework/operator-registry v1.41.0
26+
github.com/operator-framework/api v0.25.0
27+
github.com/operator-framework/operator-registry v1.43.1
2828
github.com/otiai10/copy v1.14.0
2929
github.com/pkg/errors v0.9.1
30-
github.com/prometheus/client_golang v1.18.0
30+
github.com/prometheus/client_golang v1.19.0
3131
github.com/prometheus/client_model v0.6.1
32-
github.com/prometheus/common v0.47.0
32+
github.com/prometheus/common v0.51.1
3333
github.com/sirupsen/logrus v1.9.3
3434
github.com/spf13/cobra v1.8.0
3535
github.com/spf13/pflag v1.0.5
3636
github.com/stretchr/testify v1.9.0
3737
golang.org/x/net v0.25.0
3838
golang.org/x/sync v0.7.0
3939
golang.org/x/time v0.5.0
40-
google.golang.org/grpc v1.63.2
40+
google.golang.org/grpc v1.64.0
4141
gopkg.in/yaml.v2 v2.4.0
4242
k8s.io/api v0.30.1
4343
k8s.io/apiextensions-apiserver v0.30.1
@@ -57,43 +57,43 @@ require (
5757
require (
5858
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
5959
github.com/BurntSushi/toml v1.3.2 // indirect
60-
github.com/Microsoft/go-winio v0.6.1 // indirect
61-
github.com/Microsoft/hcsshim v0.12.0-rc.3 // indirect
60+
github.com/Microsoft/go-winio v0.6.2 // indirect
61+
github.com/Microsoft/hcsshim v0.12.3 // indirect
6262
github.com/NYTimes/gziphandler v1.1.1 // indirect
6363
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
6464
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
6565
github.com/beorn7/perks v1.0.1 // indirect
6666
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
6767
github.com/cespare/xxhash/v2 v2.2.0 // indirect
68-
github.com/containerd/cgroups/v3 v3.0.2 // indirect
69-
github.com/containerd/containerd v1.7.16 // indirect
68+
github.com/containerd/cgroups/v3 v3.0.3 // indirect
69+
github.com/containerd/containerd v1.7.17 // indirect
7070
github.com/containerd/continuity v0.4.2 // indirect
7171
github.com/containerd/errdefs v0.1.0 // indirect
7272
github.com/containerd/log v0.1.0 // indirect
73-
github.com/containerd/ttrpc v1.2.3 // indirect
73+
github.com/containerd/ttrpc v1.2.4 // indirect
7474
github.com/containerd/typeurl/v2 v2.1.1 // indirect
75-
github.com/containers/common v0.58.2 // indirect
76-
github.com/containers/image/v5 v5.30.1 // indirect
75+
github.com/containers/common v0.59.0 // indirect
76+
github.com/containers/image/v5 v5.31.0 // indirect
7777
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
78-
github.com/containers/ocicrypt v1.1.9 // indirect
79-
github.com/containers/storage v1.53.0 // indirect
78+
github.com/containers/ocicrypt v1.1.10 // indirect
79+
github.com/containers/storage v1.54.0 // indirect
8080
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
81-
github.com/davecgh/go-spew v1.1.1 // indirect
82-
github.com/docker/cli v26.1.2+incompatible // indirect
81+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
82+
github.com/docker/cli v26.1.3+incompatible // indirect
8383
github.com/docker/distribution v2.8.3+incompatible // indirect
84-
github.com/docker/docker v25.0.5+incompatible // indirect
84+
github.com/docker/docker v26.1.3+incompatible // indirect
8585
github.com/docker/docker-credential-helpers v0.8.1 // indirect
8686
github.com/docker/go-connections v0.5.0 // indirect
8787
github.com/docker/go-units v0.5.0 // indirect
8888
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
8989
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
90-
github.com/fatih/color v1.17.0 // indirect
90+
github.com/fatih/color v1.16.0 // indirect
9191
github.com/felixge/httpsnoop v1.0.4 // indirect
9292
github.com/go-logr/stdr v1.2.2 // indirect
9393
github.com/go-logr/zapr v1.3.0 // indirect
94-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
95-
github.com/go-openapi/jsonreference v0.20.4 // indirect
96-
github.com/go-openapi/swag v0.22.10 // indirect
94+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
95+
github.com/go-openapi/jsonreference v0.21.0 // indirect
96+
github.com/go-openapi/swag v0.23.0 // indirect
9797
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
9898
github.com/gobuffalo/flect v1.0.2 // indirect
9999
github.com/gogo/protobuf v1.3.2 // indirect
@@ -110,15 +110,12 @@ require (
110110
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
111111
github.com/h2non/filetype v1.1.3 // indirect
112112
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
113-
github.com/hashicorp/errwrap v1.1.0 // indirect
114-
github.com/hashicorp/go-multierror v1.1.1 // indirect
115113
github.com/imdario/mergo v0.3.16 // indirect
116114
github.com/inconshreveable/mousetrap v1.1.0 // indirect
117115
github.com/itchyny/timefmt-go v0.1.6 // indirect
118116
github.com/josharian/intern v1.0.0 // indirect
119117
github.com/json-iterator/go v1.1.12 // indirect
120-
github.com/klauspost/compress v1.17.7 // indirect
121-
github.com/klauspost/pgzip v1.2.6 // indirect
118+
github.com/klauspost/compress v1.17.8 // indirect
122119
github.com/mailru/easyjson v0.7.7 // indirect
123120
github.com/mattn/go-colorable v0.1.13 // indirect
124121
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -133,42 +130,37 @@ require (
133130
github.com/opencontainers/go-digest v1.0.0 // indirect
134131
github.com/opencontainers/image-spec v1.1.0 // indirect
135132
github.com/opencontainers/runtime-spec v1.2.0 // indirect
136-
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 // indirect
137-
github.com/pmezard/go-difflib v1.0.0 // indirect
133+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
138134
github.com/prometheus/procfs v0.12.0 // indirect
139-
github.com/rogpeppe/go-internal v1.12.0 // indirect
140135
github.com/stoewer/go-strcase v1.3.0 // indirect
141136
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
142-
github.com/ulikunitz/xz v0.5.11 // indirect
143-
github.com/vbatts/tar-split v0.11.5 // indirect
144137
go.etcd.io/bbolt v1.3.10 // indirect
145138
go.etcd.io/etcd/api/v3 v3.5.12 // indirect
146139
go.etcd.io/etcd/client/pkg/v3 v3.5.12 // indirect
147140
go.etcd.io/etcd/client/v3 v3.5.12 // indirect
148141
go.opencensus.io v0.24.0 // indirect
149142
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 // indirect
150-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 // indirect
151-
go.opentelemetry.io/otel v1.23.1 // indirect
143+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
144+
go.opentelemetry.io/otel v1.24.0 // indirect
152145
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.1 // indirect
153146
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.23.1 // indirect
154-
go.opentelemetry.io/otel/metric v1.23.1 // indirect
147+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
155148
go.opentelemetry.io/otel/sdk v1.23.1 // indirect
156-
go.opentelemetry.io/otel/trace v1.23.1 // indirect
149+
go.opentelemetry.io/otel/trace v1.24.0 // indirect
157150
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
158151
go.uber.org/multierr v1.11.0 // indirect
159152
go.uber.org/zap v1.26.0 // indirect
160153
golang.org/x/crypto v0.23.0 // indirect
161-
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
154+
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
162155
golang.org/x/mod v0.17.0 // indirect
163-
golang.org/x/oauth2 v0.18.0 // indirect
156+
golang.org/x/oauth2 v0.20.0 // indirect
164157
golang.org/x/sys v0.20.0 // indirect
165158
golang.org/x/term v0.20.0 // indirect
166159
golang.org/x/text v0.15.0 // indirect
167160
golang.org/x/tools v0.21.0 // indirect
168161
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
169-
google.golang.org/appengine v1.6.8 // indirect
170162
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
171-
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
163+
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
172164
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
173165
google.golang.org/protobuf v1.34.1 // indirect
174166
gopkg.in/inf.v0 v0.9.1 // indirect
@@ -183,6 +175,17 @@ require (
183175
sigs.k8s.io/yaml v1.4.0 // indirect
184176
)
185177

178+
// pin to v1.18.0 until k8s.io/component-base updates its prometheus dependency
179+
// issue: https://github.com/operator-framework/operator-lifecycle-manager/issues/3283
180+
replace (
181+
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.18.0
182+
github.com/prometheus/common => github.com/prometheus/common v0.47.0
183+
)
184+
185+
// v1.64.0 breaks our e2e tests as it affects the grpc connection state transition
186+
// issue: https://github.com/operator-framework/operator-lifecycle-manager/issues/3284
187+
replace google.golang.org/grpc => google.golang.org/grpc v1.63.2
188+
186189
replace (
187190
// controller runtime
188191
github.com/openshift/api => github.com/openshift/api v0.0.0-20221021112143-4226c2167e40 // release-4.12

0 commit comments

Comments
 (0)