Skip to content

Commit e651b0f

Browse files
camilamacedo86acornett21
camilamacedo86
and
acornett21
authored
⚠️ Upgrade kubebuilder scaffold from v4.2.0 to v4.5.2 (#6928)
* Upgrade kubebuilder scaffold from v4.2.0 to v4.5.2 Signed-off-by: Camila Macedo <7708031+camilamacedo86@users.noreply.github.com> * updating ansible-operator-plugin version Signed-off-by: Adam D. Cornett <adc@redhat.com> Signed-off-by: Camila Macedo <7708031+camilamacedo86@users.noreply.github.com> * fix: resolve E2E integration test failure Comment kustomize code to pass certs for the metric server for tests with packagemanifest Signed-off-by: Camila Macedo <7708031+camilamacedo86@users.noreply.github.com> * Add changelog for the update Signed-off-by: Camila Macedo <7708031+camilamacedo86@users.noreply.github.com> * Cleanup Helm to not add CertManager with Metrics and Prometheus Options Signed-off-by: Camila Macedo <7708031+camilamacedo86@users.noreply.github.com> --------- Signed-off-by: Camila Macedo <7708031+camilamacedo86@users.noreply.github.com> Signed-off-by: Adam D. Cornett <adc@redhat.com> Co-authored-by: Adam D. Cornett <adc@redhat.com>
1 parent 4407fd6 commit e651b0f

File tree

134 files changed

+3658
-1960
lines changed

Some content is hidden

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

134 files changed

+3658
-1960
lines changed

‎changelog/fragments/upgrade_kubebuilder_deps.yaml

Lines changed: 612 additions & 0 deletions
Large diffs are not rendered by default.

‎go.mod

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/operator-framework/operator-sdk
22

3-
go 1.23.4
3+
go 1.23.6
44

55
require (
66
github.com/blang/semver/v4 v4.0.0
@@ -11,41 +11,42 @@ require (
1111
github.com/kr/text v0.2.0
1212
github.com/markbates/inflect v1.0.4
1313
github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2
14-
github.com/onsi/ginkgo/v2 v2.23.2
15-
github.com/onsi/gomega v1.36.2
16-
github.com/operator-framework/ansible-operator-plugins v1.37.2
17-
github.com/operator-framework/api v0.27.0
18-
github.com/operator-framework/operator-lib v0.16.0
14+
github.com/onsi/ginkgo/v2 v2.23.4
15+
github.com/onsi/gomega v1.37.0
16+
github.com/operator-framework/ansible-operator-plugins v1.38.0
17+
github.com/operator-framework/api v0.30.0
18+
github.com/operator-framework/operator-lib v0.18.0
1919
github.com/operator-framework/operator-manifest-tools v0.8.0
20-
github.com/operator-framework/operator-registry v1.49.0
21-
github.com/prometheus/client_golang v1.21.1
20+
github.com/operator-framework/operator-registry v1.51.0
21+
github.com/prometheus/client_golang v1.22.0
2222
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3
2323
github.com/sirupsen/logrus v1.9.3
2424
github.com/spf13/afero v1.14.0
2525
github.com/spf13/cobra v1.9.1
2626
github.com/spf13/pflag v1.0.6
27-
github.com/spf13/viper v1.20.0
27+
github.com/spf13/viper v1.20.1
2828
github.com/stretchr/testify v1.10.0
2929
github.com/thoas/go-funk v0.9.3
3030
golang.org/x/mod v0.24.0
31-
golang.org/x/text v0.23.0
32-
golang.org/x/tools v0.31.0
31+
golang.org/x/text v0.24.0
32+
golang.org/x/tools v0.32.0
3333
gomodules.xyz/jsonpatch/v3 v3.0.1
3434
helm.sh/helm/v3 v3.16.3
35-
k8s.io/api v0.31.7
36-
k8s.io/apiextensions-apiserver v0.31.7
37-
k8s.io/apimachinery v0.31.7
38-
k8s.io/cli-runtime v0.31.7
39-
k8s.io/client-go v0.31.7
40-
k8s.io/kubectl v0.31.7
41-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
42-
sigs.k8s.io/controller-runtime v0.19.7
43-
sigs.k8s.io/controller-tools v0.16.5
44-
sigs.k8s.io/kubebuilder/v4 v4.2.0
35+
k8s.io/api v0.32.4
36+
k8s.io/apiextensions-apiserver v0.32.4
37+
k8s.io/apimachinery v0.32.4
38+
k8s.io/cli-runtime v0.32.4
39+
k8s.io/client-go v0.32.4
40+
k8s.io/kubectl v0.32.4
41+
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e
42+
sigs.k8s.io/controller-runtime v0.20.4
43+
sigs.k8s.io/controller-tools v0.17.2
44+
sigs.k8s.io/kubebuilder/v4 v4.5.2
4545
sigs.k8s.io/yaml v1.4.0
4646
)
4747

4848
require (
49+
cel.dev/expr v0.19.0 // indirect
4950
dario.cat/mergo v1.0.1 // indirect
5051
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
5152
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
@@ -68,17 +69,17 @@ require (
6869
github.com/containerd/containerd v1.7.27 // indirect
6970
github.com/containerd/containerd/api v1.8.0 // indirect
7071
github.com/containerd/continuity v0.4.4 // indirect
71-
github.com/containerd/errdefs v0.3.0 // indirect
72+
github.com/containerd/errdefs v1.0.0 // indirect
7273
github.com/containerd/errdefs/pkg v0.3.0 // indirect
7374
github.com/containerd/log v0.1.0 // indirect
7475
github.com/containerd/platforms v0.2.1 // indirect
7576
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
7677
github.com/containerd/ttrpc v1.2.7 // indirect
77-
github.com/containerd/typeurl/v2 v2.2.0 // indirect
78-
github.com/containers/common v0.60.4 // indirect
79-
github.com/containers/image/v5 v5.32.2 // indirect
78+
github.com/containerd/typeurl/v2 v2.2.3 // indirect
79+
github.com/containers/common v0.62.0 // indirect
80+
github.com/containers/image/v5 v5.34.0 // indirect
8081
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
81-
github.com/containers/ocicrypt v1.2.0 // indirect
82+
github.com/containers/ocicrypt v1.2.1 // indirect
8283
github.com/containers/storage v1.57.2 // indirect
8384
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
8485
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
@@ -87,17 +88,17 @@ require (
8788
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
8889
github.com/distribution/distribution/v3 v3.0.0-rc.3 // indirect
8990
github.com/distribution/reference v0.6.0 // indirect
90-
github.com/docker/cli v27.3.1+incompatible // indirect
91+
github.com/docker/cli v28.0.0+incompatible // indirect
9192
github.com/docker/distribution v2.8.3+incompatible // indirect
92-
github.com/docker/docker v27.2.0+incompatible // indirect
93+
github.com/docker/docker v27.5.1+incompatible // indirect
9394
github.com/docker/docker-credential-helpers v0.8.2 // indirect
9495
github.com/docker/go-connections v0.5.0 // indirect
9596
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
9697
github.com/docker/go-metrics v0.0.1 // indirect
9798
github.com/docker/go-units v0.5.0 // indirect
9899
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
99100
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
100-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
101+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
101102
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
102103
github.com/fatih/color v1.18.0 // indirect
103104
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -119,16 +120,16 @@ require (
119120
github.com/gobuffalo/flect v1.0.3 // indirect
120121
github.com/gobwas/glob v0.2.3 // indirect
121122
github.com/gogo/protobuf v1.3.2 // indirect
122-
github.com/golang-migrate/migrate/v4 v4.18.1 // indirect
123+
github.com/golang-migrate/migrate/v4 v4.18.2 // indirect
123124
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
124125
github.com/golang/protobuf v1.5.4 // indirect
125-
github.com/google/btree v1.1.2 // indirect
126-
github.com/google/cel-go v0.20.1 // indirect
126+
github.com/google/btree v1.1.3 // indirect
127+
github.com/google/cel-go v0.22.1 // indirect
127128
github.com/google/gnostic-models v0.6.8 // indirect
128-
github.com/google/go-cmp v0.6.0 // indirect
129-
github.com/google/go-containerregistry v0.20.1 // indirect
129+
github.com/google/go-cmp v0.7.0 // indirect
130+
github.com/google/go-containerregistry v0.20.2 // indirect
130131
github.com/google/gofuzz v1.2.0 // indirect
131-
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
132+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
132133
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
133134
github.com/google/uuid v1.6.0 // indirect
134135
github.com/gorilla/handlers v1.5.2 // indirect
@@ -144,15 +145,14 @@ require (
144145
github.com/hashicorp/golang-lru/arc/v2 v2.0.5 // indirect
145146
github.com/hashicorp/golang-lru/v2 v2.0.5 // indirect
146147
github.com/huandu/xstrings v1.5.0 // indirect
147-
github.com/imdario/mergo v0.3.16 // indirect
148148
github.com/inconshreveable/mousetrap v1.1.0 // indirect
149149
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
150150
github.com/jmoiron/sqlx v1.4.0 // indirect
151151
github.com/joelanford/ignore v0.1.1 // indirect
152152
github.com/joho/godotenv v1.3.0 // indirect
153153
github.com/josharian/intern v1.0.0 // indirect
154154
github.com/json-iterator/go v1.1.12 // indirect
155-
github.com/klauspost/compress v1.17.11 // indirect
155+
github.com/klauspost/compress v1.18.0 // indirect
156156
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
157157
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
158158
github.com/lib/pq v1.10.9 // indirect
@@ -167,7 +167,7 @@ require (
167167
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
168168
github.com/mitchellh/reflectwalk v1.0.2 // indirect
169169
github.com/moby/locker v1.0.1 // indirect
170-
github.com/moby/spdystream v0.4.0 // indirect
170+
github.com/moby/spdystream v0.5.0 // indirect
171171
github.com/moby/sys/capability v0.4.0 // indirect
172172
github.com/moby/sys/mountinfo v0.7.2 // indirect
173173
github.com/moby/sys/sequential v0.5.0 // indirect
@@ -182,35 +182,35 @@ require (
182182
github.com/opencontainers/go-digest v1.0.0 // indirect
183183
github.com/opencontainers/image-spec v1.1.0 // indirect
184184
github.com/opencontainers/runtime-spec v1.2.0 // indirect
185-
github.com/otiai10/copy v1.14.0 // indirect
185+
github.com/otiai10/copy v1.14.1 // indirect
186+
github.com/otiai10/mint v1.6.3 // indirect
186187
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
187188
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
188189
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 // indirect
189190
github.com/pkg/errors v0.9.1 // indirect
190191
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
191-
github.com/prometheus/client_model v0.6.1 // indirect
192+
github.com/prometheus/client_model v0.6.2 // indirect
192193
github.com/prometheus/common v0.62.0 // indirect
193194
github.com/prometheus/procfs v0.15.1 // indirect
194195
github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 // indirect
195196
github.com/redis/go-redis/extra/redisotel/v9 v9.0.5 // indirect
196197
github.com/redis/go-redis/v9 v9.1.0 // indirect
197198
github.com/rivo/uniseg v0.4.7 // indirect
198-
github.com/rubenv/sql-migrate v1.7.0 // indirect
199+
github.com/rubenv/sql-migrate v1.7.1 // indirect
199200
github.com/russross/blackfriday/v2 v2.1.0 // indirect
200201
github.com/sagikazarmark/locafero v0.7.0 // indirect
201202
github.com/shopspring/decimal v1.4.0 // indirect
202203
github.com/sourcegraph/conc v0.3.0 // indirect
203204
github.com/spf13/cast v1.7.1 // indirect
204205
github.com/stoewer/go-strcase v1.3.0 // indirect
205206
github.com/subosito/gotenv v1.6.0 // indirect
206-
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
207207
github.com/vbatts/tar-split v0.11.7 // indirect
208208
github.com/x448/float16 v0.8.4 // indirect
209209
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
210210
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
211211
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
212212
github.com/xlab/treeprint v1.2.0 // indirect
213-
go.etcd.io/bbolt v1.3.11 // indirect
213+
go.etcd.io/bbolt v1.4.0 // indirect
214214
go.opencensus.io v0.24.0 // indirect
215215
go.opentelemetry.io/contrib/bridges/prometheus v0.57.0 // indirect
216216
go.opentelemetry.io/contrib/exporters/autoexport v0.57.0 // indirect
@@ -234,37 +234,37 @@ require (
234234
go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
235235
go.opentelemetry.io/otel/trace v1.32.0 // indirect
236236
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
237-
go.starlark.net v0.0.0-20230612165344-9532f5667272 // indirect
237+
go.uber.org/automaxprocs v1.6.0 // indirect
238238
go.uber.org/multierr v1.11.0 // indirect
239-
go.uber.org/zap v1.26.0 // indirect
240-
golang.org/x/crypto v0.36.0 // indirect
241-
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
242-
golang.org/x/net v0.38.0 // indirect
243-
golang.org/x/oauth2 v0.24.0 // indirect
244-
golang.org/x/sync v0.12.0 // indirect
245-
golang.org/x/sys v0.31.0 // indirect
246-
golang.org/x/term v0.30.0 // indirect
247-
golang.org/x/time v0.6.0 // indirect
239+
go.uber.org/zap v1.27.0 // indirect
240+
golang.org/x/crypto v0.37.0 // indirect
241+
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329 // indirect
242+
golang.org/x/net v0.39.0 // indirect
243+
golang.org/x/oauth2 v0.27.0 // indirect
244+
golang.org/x/sync v0.13.0 // indirect
245+
golang.org/x/sys v0.32.0 // indirect
246+
golang.org/x/term v0.31.0 // indirect
247+
golang.org/x/time v0.7.0 // indirect
248248
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
249249
gomodules.xyz/orderedmap v0.1.0 // indirect
250250
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
251-
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
252-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
253-
google.golang.org/grpc v1.68.1 // indirect
254-
google.golang.org/protobuf v1.36.1 // indirect
251+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
252+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e // indirect
253+
google.golang.org/grpc v1.70.0 // indirect
254+
google.golang.org/protobuf v1.36.6 // indirect
255255
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
256256
gopkg.in/inf.v0 v0.9.1 // indirect
257257
gopkg.in/warnings.v0 v0.1.2 // indirect
258258
gopkg.in/yaml.v2 v2.4.0 // indirect
259259
gopkg.in/yaml.v3 v3.0.1 // indirect
260-
k8s.io/apiserver v0.31.7 // indirect
261-
k8s.io/component-base v0.31.7 // indirect
260+
k8s.io/apiserver v0.32.4 // indirect
261+
k8s.io/component-base v0.32.4 // indirect
262262
k8s.io/klog/v2 v2.130.1 // indirect
263-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
263+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
264264
oras.land/oras-go v1.2.5 // indirect
265-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
266-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
267-
sigs.k8s.io/kustomize/api v0.17.2 // indirect
268-
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
269-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
265+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
266+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
267+
sigs.k8s.io/kustomize/api v0.18.0 // indirect
268+
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
269+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
270270
)

0 commit comments

Comments
 (0)