Skip to content

Commit c2b6bb1

Browse files
Merge pull request #758 from perdasilva/perdasilva/manual-sync-2905
NO-ISSUE: (Manual) Synchronize From Upstream Repositories
2 parents 56b7b9d + a94f22f commit c2b6bb1

File tree

1,726 files changed

+152296
-56162
lines changed

Some content is hidden

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

1,726 files changed

+152296
-56162
lines changed

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-9-release-golang-1.21-openshift-4.16
4+
tag: rhel-9-release-golang-1.22-openshift-4.17

base.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Dockerfile to bootstrap build and test in openshift-ci
22

3-
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14
3+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
44

55
ARG KUBEBUILDER_RELEASE=2.3.1
66
# Install test dependencies

codegen.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.13-alpine
1+
FROM golang:1.22-alpine
22

33
RUN apk update && \
44
apk add make git protobuf

go.mod

Lines changed: 86 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,53 @@
11
module github.com/openshift/operator-framework-olm
22

3-
go 1.21
3+
go 1.22.0
4+
5+
toolchain go1.22.3
46

57
require (
68
github.com/blang/semver/v4 v4.0.0
79
github.com/go-bindata/go-bindata/v3 v3.1.3
810
github.com/go-logr/logr v1.4.1
911
github.com/golang/mock v1.6.0
1012
github.com/googleapis/gnostic v0.5.5
11-
github.com/grpc-ecosystem/grpc-health-probe v0.4.24
13+
github.com/grpc-ecosystem/grpc-health-probe v0.4.26
1214
github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1
1315
github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37
14-
github.com/onsi/ginkgo/v2 v2.17.1
16+
github.com/onsi/ginkgo/v2 v2.17.3
1517
github.com/openshift/api v3.9.0+incompatible
1618
github.com/operator-framework/api v0.23.0
1719
github.com/operator-framework/operator-lifecycle-manager v0.0.0-00010101000000-000000000000
18-
github.com/operator-framework/operator-registry v1.39.0
20+
github.com/operator-framework/operator-registry v1.41.0
1921
github.com/sirupsen/logrus v1.9.3
2022
github.com/spf13/cobra v1.8.0
21-
github.com/stretchr/testify v1.8.4
23+
github.com/stretchr/testify v1.9.0
2224
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
23-
google.golang.org/protobuf v1.33.0
25+
google.golang.org/protobuf v1.34.1
2426
gopkg.in/yaml.v2 v2.4.0
25-
helm.sh/helm/v3 v3.14.3
26-
k8s.io/api v0.29.3
27-
k8s.io/apimachinery v0.29.3
28-
k8s.io/client-go v0.29.3
29-
k8s.io/code-generator v0.29.3
30-
k8s.io/kube-openapi v0.0.0-20240221221325-2ac9dc51f3f1
27+
helm.sh/helm/v3 v3.14.4
28+
k8s.io/api v0.30.1
29+
k8s.io/apimachinery v0.30.1
30+
k8s.io/client-go v0.30.1
31+
k8s.io/code-generator v0.30.1
32+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
3133
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
32-
sigs.k8s.io/controller-runtime v0.17.2
33-
sigs.k8s.io/controller-tools v0.8.0
34+
sigs.k8s.io/controller-runtime v0.18.3
35+
sigs.k8s.io/controller-tools v0.15.0
3436
)
3537

38+
// pin to v1.18.0 until k8s.io/component-base updates its prometheus dependencies
39+
// issue: https://github.com/operator-framework/operator-lifecycle-manager/issues/3283
40+
replace (
41+
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.18.0
42+
github.com/prometheus/common => github.com/prometheus/common v0.47.0
43+
)
44+
45+
// latest gRPC library causes changes in the way the CatalogSource connection status behaves
46+
// previously it would reach READY - but now seems to stay on IDLE unless there is data going down the pipe
47+
// this is breaking many CatalogSource related tests
48+
// issue: https://github.com/operator-framework/operator-lifecycle-manager/issues/3284
49+
replace google.golang.org/grpc => google.golang.org/grpc v1.63.2
50+
3651
require (
3752
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
3853
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
@@ -44,44 +59,45 @@ require (
4459
github.com/Masterminds/squirrel v1.5.4 // indirect
4560
github.com/Masterminds/vcs v1.13.3 // indirect
4661
github.com/Microsoft/go-winio v0.6.1 // indirect
47-
github.com/Microsoft/hcsshim v0.12.0-rc.1 // indirect
62+
github.com/Microsoft/hcsshim v0.12.0-rc.3 // indirect
4863
github.com/NYTimes/gziphandler v1.1.1 // indirect
64+
github.com/akrylysov/pogreb v0.10.2 // indirect
4965
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
5066
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
5167
github.com/beorn7/perks v1.0.1 // indirect
5268
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
5369
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5470
github.com/chai2010/gettext-go v1.0.2 // indirect
5571
github.com/containerd/cgroups/v3 v3.0.2 // indirect
56-
github.com/containerd/containerd v1.7.12 // indirect
72+
github.com/containerd/containerd v1.7.16 // indirect
5773
github.com/containerd/continuity v0.4.2 // indirect
74+
github.com/containerd/errdefs v0.1.0 // indirect
5875
github.com/containerd/log v0.1.0 // indirect
59-
github.com/containerd/ttrpc v1.2.2 // indirect
76+
github.com/containerd/ttrpc v1.2.3 // indirect
6077
github.com/containerd/typeurl/v2 v2.1.1 // indirect
61-
github.com/containers/common v0.57.1 // indirect
62-
github.com/containers/image/v5 v5.29.0 // indirect
78+
github.com/containers/common v0.58.2 // indirect
79+
github.com/containers/image/v5 v5.30.1 // indirect
6380
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
6481
github.com/containers/ocicrypt v1.1.9 // indirect
65-
github.com/containers/storage v1.51.0 // indirect
82+
github.com/containers/storage v1.53.0 // indirect
6683
github.com/coreos/go-semver v0.3.1 // indirect
6784
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
6885
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
6986
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
7087
github.com/davecgh/go-spew v1.1.1 // indirect
71-
github.com/distribution/distribution v2.7.1+incompatible // indirect
7288
github.com/distribution/reference v0.6.0 // indirect
73-
github.com/docker/cli v25.0.5+incompatible // indirect
89+
github.com/docker/cli v26.1.2+incompatible // indirect
7490
github.com/docker/distribution v2.8.3+incompatible // indirect
7591
github.com/docker/docker v25.0.5+incompatible // indirect
76-
github.com/docker/docker-credential-helpers v0.8.0 // indirect
92+
github.com/docker/docker-credential-helpers v0.8.1 // indirect
7793
github.com/docker/go-connections v0.5.0 // indirect
7894
github.com/docker/go-metrics v0.0.1 // indirect
7995
github.com/docker/go-units v0.5.0 // indirect
8096
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
8197
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
82-
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
98+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
8399
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
84-
github.com/fatih/color v1.15.0 // indirect
100+
github.com/fatih/color v1.17.0 // indirect
85101
github.com/felixge/httpsnoop v1.0.4 // indirect
86102
github.com/fsnotify/fsnotify v1.7.0 // indirect
87103
github.com/fvbommel/sortorder v1.1.0 // indirect
@@ -91,27 +107,27 @@ require (
91107
github.com/go-git/go-billy/v5 v5.5.0 // indirect
92108
github.com/go-git/go-git/v5 v5.11.0 // indirect
93109
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
94-
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
110+
github.com/go-jose/go-jose/v4 v4.0.1 // indirect
95111
github.com/go-logr/stdr v1.2.2 // indirect
96112
github.com/go-logr/zapr v1.3.0 // indirect
97113
github.com/go-openapi/jsonpointer v0.20.2 // indirect
98114
github.com/go-openapi/jsonreference v0.20.4 // indirect
99-
github.com/go-openapi/swag v0.22.9 // indirect
100-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
101-
github.com/gobuffalo/flect v0.2.3 // indirect
115+
github.com/go-openapi/swag v0.22.10 // indirect
116+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
117+
github.com/gobuffalo/flect v1.0.2 // indirect
102118
github.com/gobwas/glob v0.2.3 // indirect
103-
github.com/goccy/go-yaml v1.8.1 // indirect
119+
github.com/goccy/go-yaml v1.11.0 // indirect
104120
github.com/gofrs/flock v0.8.1 // indirect
105121
github.com/gogo/protobuf v1.3.2 // indirect
106-
github.com/golang-migrate/migrate/v4 v4.17.0 // indirect
122+
github.com/golang-migrate/migrate/v4 v4.17.1 // indirect
107123
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
108124
github.com/golang/protobuf v1.5.4 // indirect
109125
github.com/google/btree v1.0.1 // indirect
110-
github.com/google/cel-go v0.17.7 // indirect
126+
github.com/google/cel-go v0.17.8 // indirect
111127
github.com/google/gnostic-models v0.6.8 // indirect
112128
github.com/google/go-cmp v0.6.0 // indirect
113129
github.com/google/gofuzz v1.2.0 // indirect
114-
github.com/google/pprof v0.0.0-20230323073829-e72429f035bd // indirect
130+
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
115131
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
116132
github.com/google/uuid v1.6.0 // indirect
117133
github.com/gorilla/mux v1.8.1 // indirect
@@ -127,74 +143,73 @@ require (
127143
github.com/huandu/xstrings v1.4.0 // indirect
128144
github.com/imdario/mergo v0.3.16 // indirect
129145
github.com/inconshreveable/mousetrap v1.1.0 // indirect
130-
github.com/itchyny/astgen-go v0.0.0-20200519013840-cf3ea398f645 // indirect
131-
github.com/itchyny/gojq v0.11.0 // indirect
146+
github.com/itchyny/gojq v0.12.15 // indirect
147+
github.com/itchyny/timefmt-go v0.1.5 // indirect
132148
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
133149
github.com/jmoiron/sqlx v1.3.5 // indirect
134-
github.com/joelanford/ignore v0.0.0-20210607151042-0d25dc18b62d // indirect
150+
github.com/joelanford/ignore v0.1.0 // indirect
135151
github.com/josharian/intern v1.0.0 // indirect
136152
github.com/json-iterator/go v1.1.12 // indirect
137-
github.com/kisielk/errcheck v1.5.0 // indirect
138-
github.com/klauspost/compress v1.17.4 // indirect
153+
github.com/kisielk/errcheck v1.7.0 // indirect
154+
github.com/klauspost/compress v1.17.7 // indirect
139155
github.com/klauspost/pgzip v1.2.6 // indirect
140156
github.com/kylelemons/godebug v1.1.0 // indirect
141157
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
142158
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
143-
github.com/lestrrat-go/strftime v1.0.1 // indirect
144159
github.com/lib/pq v1.10.9 // indirect
145160
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
146161
github.com/mailru/easyjson v0.7.7 // indirect
147162
github.com/mattn/go-colorable v0.1.13 // indirect
148-
github.com/mattn/go-isatty v0.0.17 // indirect
163+
github.com/mattn/go-isatty v0.0.20 // indirect
149164
github.com/mattn/go-runewidth v0.0.15 // indirect
150165
github.com/mattn/go-sqlite3 v1.14.22 // indirect
151166
github.com/mitchellh/copystructure v1.2.0 // indirect
152167
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
153-
github.com/mitchellh/hashstructure v1.0.0 // indirect
168+
github.com/mitchellh/hashstructure v1.1.0 // indirect
154169
github.com/mitchellh/mapstructure v1.5.0 // indirect
155170
github.com/mitchellh/reflectwalk v1.0.2 // indirect
156171
github.com/moby/locker v1.0.1 // indirect
157172
github.com/moby/spdystream v0.2.0 // indirect
158173
github.com/moby/sys/mountinfo v0.7.1 // indirect
159174
github.com/moby/sys/sequential v0.5.0 // indirect
175+
github.com/moby/sys/user v0.1.0 // indirect
160176
github.com/moby/term v0.5.0 // indirect
161177
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
162178
github.com/modern-go/reflect2 v1.0.2 // indirect
163179
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
164180
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
165181
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
166-
github.com/onsi/gomega v1.31.1 // indirect
182+
github.com/onsi/gomega v1.33.1 // indirect
167183
github.com/opencontainers/go-digest v1.0.0 // indirect
168-
github.com/opencontainers/image-spec v1.1.0-rc6 // indirect
169-
github.com/opencontainers/runc v1.1.12 // indirect
170-
github.com/opencontainers/runtime-spec v1.1.0 // indirect
184+
github.com/opencontainers/image-spec v1.1.0 // indirect
185+
github.com/opencontainers/runtime-spec v1.2.0 // indirect
171186
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a // indirect
172187
github.com/otiai10/copy v1.14.0 // indirect
173-
github.com/pbnjay/strptime v0.0.0-20140226051138-5c05b0d668c9 // indirect
174188
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
175189
github.com/pkg/errors v0.9.1 // indirect
176190
github.com/pmezard/go-difflib v1.0.0 // indirect
177191
github.com/prometheus/client_golang v1.18.0 // indirect
178-
github.com/prometheus/client_model v0.6.0 // indirect
192+
github.com/prometheus/client_model v0.6.1 // indirect
179193
github.com/prometheus/common v0.47.0 // indirect
180194
github.com/prometheus/procfs v0.12.0 // indirect
181-
github.com/rivo/uniseg v0.4.4 // indirect
195+
github.com/rivo/uniseg v0.4.7 // indirect
182196
github.com/rubenv/sql-migrate v1.5.2 // indirect
183197
github.com/russross/blackfriday/v2 v2.1.0 // indirect
184198
github.com/shopspring/decimal v1.3.1 // indirect
185199
github.com/spf13/cast v1.5.0 // indirect
186200
github.com/spf13/pflag v1.0.5 // indirect
187-
github.com/spiffe/go-spiffe/v2 v2.1.6 // indirect
201+
github.com/spiffe/go-spiffe/v2 v2.2.0 // indirect
188202
github.com/stoewer/go-strcase v1.3.0 // indirect
189203
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
204+
github.com/tidwall/btree v1.7.0 // indirect
190205
github.com/ulikunitz/xz v0.5.11 // indirect
191206
github.com/vbatts/tar-split v0.11.5 // indirect
192207
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
193208
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
194209
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
195210
github.com/xlab/treeprint v1.2.0 // indirect
196211
github.com/zeebo/errs v1.3.0 // indirect
197-
go.etcd.io/bbolt v1.3.9 // indirect
212+
go.etcd.io/bbolt v1.3.10 // indirect
198213
go.etcd.io/etcd/api/v3 v3.5.12 // indirect
199214
go.etcd.io/etcd/client/pkg/v3 v3.5.12 // indirect
200215
go.etcd.io/etcd/client/v3 v3.5.12 // indirect
@@ -211,39 +226,39 @@ require (
211226
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
212227
go.uber.org/multierr v1.11.0 // indirect
213228
go.uber.org/zap v1.26.0 // indirect
214-
golang.org/x/crypto v0.21.0 // indirect
215-
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
229+
golang.org/x/crypto v0.23.0 // indirect
230+
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
216231
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
217-
golang.org/x/mod v0.16.0 // indirect
218-
golang.org/x/net v0.23.0 // indirect
219-
golang.org/x/oauth2 v0.17.0 // indirect
220-
golang.org/x/sync v0.6.0 // indirect
221-
golang.org/x/sys v0.18.0 // indirect
222-
golang.org/x/term v0.18.0 // indirect
223-
golang.org/x/text v0.14.0 // indirect
232+
golang.org/x/mod v0.17.0 // indirect
233+
golang.org/x/net v0.25.0 // indirect
234+
golang.org/x/oauth2 v0.18.0 // indirect
235+
golang.org/x/sync v0.7.0 // indirect
236+
golang.org/x/sys v0.20.0 // indirect
237+
golang.org/x/term v0.20.0 // indirect
238+
golang.org/x/text v0.15.0 // indirect
224239
golang.org/x/time v0.5.0 // indirect
225-
golang.org/x/tools v0.18.0 // indirect
226-
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
240+
golang.org/x/tools v0.21.0 // indirect
241+
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
227242
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
228243
google.golang.org/appengine v1.6.8 // indirect
229-
google.golang.org/genproto v0.0.0-20240221002015-b0ce06bbee7c // indirect
230-
google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9 // indirect
231-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c // indirect
232-
google.golang.org/grpc v1.61.1 // indirect
244+
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
245+
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
246+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
247+
google.golang.org/grpc v1.63.2 // indirect
233248
gopkg.in/inf.v0 v0.9.1 // indirect
234249
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
235250
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
236251
gopkg.in/warnings.v0 v0.1.2 // indirect
237252
gopkg.in/yaml.v3 v3.0.1 // indirect
238-
k8s.io/apiextensions-apiserver v0.29.3 // indirect
239-
k8s.io/apiserver v0.29.3 // indirect
253+
k8s.io/apiextensions-apiserver v0.30.1 // indirect
254+
k8s.io/apiserver v0.30.1 // indirect
240255
k8s.io/cli-runtime v0.29.3 // indirect
241-
k8s.io/component-base v0.29.3 // indirect
242-
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
256+
k8s.io/component-base v0.30.1 // indirect
257+
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
243258
k8s.io/klog v1.0.0 // indirect
244259
k8s.io/klog/v2 v2.120.1 // indirect
245-
k8s.io/kms v0.29.3 // indirect
246-
k8s.io/kube-aggregator v0.29.3 // indirect
260+
k8s.io/kms v0.30.1 // indirect
261+
k8s.io/kube-aggregator v0.30.1 // indirect
247262
k8s.io/kubectl v0.29.3 // indirect
248263
oras.land/oras-go v1.2.5 // indirect
249264
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect

0 commit comments

Comments
 (0)