Skip to content

Commit 49418a2

Browse files
camilamacedo86camilamacedo86
committed
Upgrade kubebuilder scaffold from v4.2.0 to v4.5.2
Signed-off-by: Camila Macedo <[email protected]>
1 parent 25d08c5 commit 49418a2

File tree

143 files changed

+2961
-1851
lines changed

Some content is hidden

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

143 files changed

+2961
-1851
lines changed

‎.github/workflows/deploy.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
jobs:
1515
check_docs_only:
1616
name: check_docs_only
17-
runs-on: ubuntu-22.04
17+
runs-on: ubuntu-24.04
1818
outputs:
1919
skip: ${{ steps.check_docs_only.outputs.skip }}
2020
steps:
@@ -35,7 +35,7 @@ jobs:
3535
needs: check_docs_only
3636
# Run this job on a tag like 'vX.Y.Z' or on a branch or pull request with code changes.
3737
if: startsWith(github.ref, 'refs/tags/v') || ( needs.check_docs_only.outputs.skip != 'true' && !startsWith(github.ref, 'refs/tags/') )
38-
runs-on: ubuntu-22.04
38+
runs-on: ubuntu-24.04
3939
environment: deploy
4040
steps:
4141
- name: checkout
@@ -69,7 +69,7 @@ jobs:
6969
needs: check_docs_only
7070
# Run this job on a tag like 'vX.Y.Z' or on a branch or pull request with code changes.
7171
if: startsWith(github.ref, 'refs/tags/v') || ( needs.check_docs_only.outputs.skip != 'true' && !startsWith(github.ref, 'refs/tags/') )
72-
runs-on: ubuntu-22.04
72+
runs-on: ubuntu-24.04
7373
environment: deploy
7474
strategy:
7575
matrix:
@@ -118,7 +118,7 @@ jobs:
118118
needs: check_docs_only
119119
# Run this job on a tag like 'scorecard-kuttl/vX.Y.Z' or on a branch or pull request with code changes.
120120
if: startsWith(github.ref, 'refs/tags/scorecard-kuttl/v') || ( needs.check_docs_only.outputs.skip != 'true' && !startsWith(github.ref, 'refs/tags/') )
121-
runs-on: ubuntu-22.04
121+
runs-on: ubuntu-24.04
122122
environment: deploy
123123
steps:
124124

‎.github/workflows/freshen-images.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313

1414
jobs:
1515
git_tags:
16-
runs-on: ubuntu-22.04
16+
runs-on: ubuntu-24.04
1717
outputs:
1818
git_tags: ${{ steps.tags.outputs.git_tags }}
1919
steps:
@@ -27,7 +27,7 @@ jobs:
2727
build:
2828
name: build
2929
needs: git_tags
30-
runs-on: ubuntu-22.04
30+
runs-on: ubuntu-24.04
3131
environment: deploy
3232
strategy:
3333
matrix:

‎.github/workflows/integration.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
jobs:
66
check_docs_only:
77
name: check_docs_only
8-
runs-on: ubuntu-22.04
8+
runs-on: ubuntu-24.04
99
outputs:
1010
skip: ${{ steps.check_docs_only.outputs.skip }}
1111
steps:
@@ -22,7 +22,7 @@ jobs:
2222
2323
integration:
2424
name: integration
25-
runs-on: ubuntu-22.04
25+
runs-on: ubuntu-24.04
2626
needs: check_docs_only
2727
if: needs.check_docs_only.outputs.skip != 'true'
2828
steps:

‎.github/workflows/rerun.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
rerun_tests:
77
name: rerun_pr_tests
88
if: ${{ github.event.issue.pull_request }}
9-
runs-on: ubuntu-22.04
9+
runs-on: ubuntu-24.04
1010
steps:
1111
- uses: operator-framework/[email protected]
1212
with:

‎.github/workflows/test-go.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env:
88
jobs:
99
check_docs_only:
1010
name: check_docs_only
11-
runs-on: ubuntu-22.04
11+
runs-on: ubuntu-24.04
1212
outputs:
1313
skip: ${{ steps.check_docs_only.outputs.skip }}
1414
steps:
@@ -25,7 +25,7 @@ jobs:
2525
2626
e2e:
2727
name: e2e
28-
runs-on: ubuntu-22.04
28+
runs-on: ubuntu-24.04
2929
needs: check_docs_only
3030
if: needs.check_docs_only.outputs.skip != 'true'
3131
steps:
@@ -45,7 +45,7 @@ jobs:
4545

4646
unit:
4747
name: unit
48-
runs-on: ubuntu-22.04
48+
runs-on: ubuntu-24.04
4949
needs: check_docs_only
5050
if: needs.check_docs_only.outputs.skip != 'true'
5151
steps:

‎.github/workflows/test-helm.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
jobs:
66
check_docs_only:
77
name: check_docs_only
8-
runs-on: ubuntu-22.04
8+
runs-on: ubuntu-24.04
99
outputs:
1010
skip: ${{ steps.check_docs_only.outputs.skip }}
1111
steps:
@@ -22,7 +22,7 @@ jobs:
2222
2323
e2e:
2424
name: e2e
25-
runs-on: ubuntu-22.04
25+
runs-on: ubuntu-24.04
2626
needs: check_docs_only
2727
if: needs.check_docs_only.outputs.skip != 'true'
2828
steps:

‎.github/workflows/test-sample-go.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
jobs:
66
check_docs_only:
77
name: check_docs_only
8-
runs-on: ubuntu-22.04
8+
runs-on: ubuntu-24.04
99
outputs:
1010
skip: ${{ steps.check_docs_only.outputs.skip }}
1111
steps:
@@ -22,7 +22,7 @@ jobs:
2222
2323
e2e:
2424
name: e2e
25-
runs-on: ubuntu-22.04
25+
runs-on: ubuntu-24.04
2626
needs: check_docs_only
2727
if: needs.check_docs_only.outputs.skip != 'true'
2828
steps:

‎.github/workflows/test-sanity.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
jobs:
66
check_docs_only:
77
name: check_docs_only
8-
runs-on: ubuntu-22.04
8+
runs-on: ubuntu-24.04
99
outputs:
1010
skip: ${{ steps.check_docs_only.outputs.skip }}
1111
steps:
@@ -22,7 +22,7 @@ jobs:
2222
2323
sanity:
2424
name: sanity
25-
runs-on: ubuntu-22.04
25+
runs-on: ubuntu-24.04
2626
needs: check_docs_only
2727
if: needs.check_docs_only.outputs.skip != 'true'
2828
steps:
@@ -43,7 +43,7 @@ jobs:
4343

4444
docs:
4545
name: docs
46-
runs-on: ubuntu-22.04
46+
runs-on: ubuntu-24.04
4747
steps:
4848
- uses: actions/checkout@v4
4949
with:

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export IMAGE_VERSION = v1.39.2
99
export SIMPLE_VERSION = $(shell (test "$(shell git describe --tags)" = "$(shell git describe --tags --abbrev=0)" && echo $(shell git describe --tags)) || echo $(shell git describe --tags --abbrev=0)+git)
1010
export GIT_VERSION = $(shell git describe --dirty --tags --always)
1111
export GIT_COMMIT = $(shell git rev-parse HEAD)
12-
export K8S_VERSION = 1.31.0
12+
export K8S_VERSION = 1.32.4
1313

1414
# Build settings
1515
export TOOLS_DIR = tools/bin
@@ -183,12 +183,12 @@ cluster-create::
183183

184184
.PHONY: dev-install
185185
dev-install::
186-
$(SCRIPTS_DIR)/fetch kind 0.24.0
186+
$(SCRIPTS_DIR)/fetch kind 0.26.0
187187
$(SCRIPTS_DIR)/fetch kubectl $(K8S_VERSION) # Install kubectl AFTER envtest because envtest includes its own kubectl binary
188188

189189
.PHONY: test-e2e-teardown
190190
test-e2e-teardown:
191-
$(SCRIPTS_DIR)/fetch kind 0.24.0
191+
$(SCRIPTS_DIR)/fetch kind 0.26.0
192192
$(TOOLS_DIR)/kind delete cluster --name $(KIND_CLUSTER)
193193
rm -f $(KUBECONFIG)
194194

‎go.mod

+29-29
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ 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
14+
github.com/onsi/ginkgo/v2 v2.23.3
15+
github.com/onsi/gomega v1.36.3
1616
github.com/operator-framework/ansible-operator-plugins v1.37.2
1717
github.com/operator-framework/api v0.27.0
1818
github.com/operator-framework/operator-lib v0.16.0
@@ -28,24 +28,25 @@ require (
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
35+
k8s.io/api v0.32.2
36+
k8s.io/apiextensions-apiserver v0.32.2
37+
k8s.io/apimachinery v0.32.2
3838
k8s.io/cli-runtime v0.31.7
39-
k8s.io/client-go v0.31.7
39+
k8s.io/client-go v0.32.2
4040
k8s.io/kubectl v0.31.7
41-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
41+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
4242
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
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.18.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
@@ -123,9 +124,9 @@ require (
123124
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
124125
github.com/golang/protobuf v1.5.4 // indirect
125126
github.com/google/btree v1.1.2 // indirect
126-
github.com/google/cel-go v0.20.1 // indirect
127+
github.com/google/cel-go v0.22.0 // 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-cmp v0.7.0 // indirect
129130
github.com/google/go-containerregistry v0.20.1 // indirect
130131
github.com/google/gofuzz v1.2.0 // indirect
131132
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
@@ -144,7 +145,6 @@ 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
@@ -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
@@ -236,35 +236,35 @@ require (
236236
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
237237
go.starlark.net v0.0.0-20230612165344-9532f5667272 // 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
239+
go.uber.org/zap v1.27.0 // indirect
240+
golang.org/x/crypto v0.37.0 // indirect
241241
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
242-
golang.org/x/net v0.37.0 // indirect
242+
golang.org/x/net v0.39.0 // indirect
243243
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
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
251251
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
252252
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
253253
google.golang.org/grpc v1.68.1 // indirect
254-
google.golang.org/protobuf v1.36.1 // indirect
254+
google.golang.org/protobuf v1.36.5 // 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.2 // indirect
261+
k8s.io/component-base v0.32.2 // 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
265+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
266+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
267267
sigs.k8s.io/kustomize/api v0.17.2 // indirect
268268
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
269-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
269+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
270270
)

0 commit comments

Comments
 (0)