Skip to content

⚠️ Upgrade kubebuilder deps add support for k8s 1.32 #6928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+2,957 −1,847
Open

⚠️ Upgrade kubebuilder deps add support for k8s 1.32 #6928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f99d8b4
Upgrade kubebuilder scaffold from v4.2.0 to v4.5.2
camilamacedo86 Apr 25, 2025
49a9193
dowgrande kind/fetch test
camilamacedo86 May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
jobs:
check_docs_only:
name: check_docs_only
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
skip: ${{ steps.check_docs_only.outputs.skip }}
steps:
Expand All @@ -35,7 +35,7 @@ jobs:
needs: check_docs_only
# Run this job on a tag like 'vX.Y.Z' or on a branch or pull request with code changes.
if: startsWith(github.ref, 'refs/tags/v') || ( needs.check_docs_only.outputs.skip != 'true' && !startsWith(github.ref, 'refs/tags/') )
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
environment: deploy
steps:
- name: checkout
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
needs: check_docs_only
# Run this job on a tag like 'vX.Y.Z' or on a branch or pull request with code changes.
if: startsWith(github.ref, 'refs/tags/v') || ( needs.check_docs_only.outputs.skip != 'true' && !startsWith(github.ref, 'refs/tags/') )
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
environment: deploy
strategy:
matrix:
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
needs: check_docs_only
# Run this job on a tag like 'scorecard-kuttl/vX.Y.Z' or on a branch or pull request with code changes.
if: startsWith(github.ref, 'refs/tags/scorecard-kuttl/v') || ( needs.check_docs_only.outputs.skip != 'true' && !startsWith(github.ref, 'refs/tags/') )
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
environment: deploy
steps:

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/freshen-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:

jobs:
git_tags:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
git_tags: ${{ steps.tags.outputs.git_tags }}
steps:
Expand All @@ -27,7 +27,7 @@ jobs:
build:
name: build
needs: git_tags
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
environment: deploy
strategy:
matrix:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
jobs:
check_docs_only:
name: check_docs_only
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
skip: ${{ steps.check_docs_only.outputs.skip }}
steps:
Expand All @@ -22,7 +22,7 @@ jobs:

integration:
name: integration
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: check_docs_only
if: needs.check_docs_only.outputs.skip != 'true'
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rerun.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
rerun_tests:
name: rerun_pr_tests
if: ${{ github.event.issue.pull_request }}
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: operator-framework/[email protected]
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
jobs:
check_docs_only:
name: check_docs_only
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
skip: ${{ steps.check_docs_only.outputs.skip }}
steps:
Expand All @@ -25,7 +25,7 @@ jobs:

e2e:
name: e2e
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: check_docs_only
if: needs.check_docs_only.outputs.skip != 'true'
steps:
Expand All @@ -45,7 +45,7 @@ jobs:

unit:
name: unit
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: check_docs_only
if: needs.check_docs_only.outputs.skip != 'true'
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-helm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
jobs:
check_docs_only:
name: check_docs_only
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
skip: ${{ steps.check_docs_only.outputs.skip }}
steps:
Expand All @@ -22,7 +22,7 @@ jobs:

e2e:
name: e2e
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: check_docs_only
if: needs.check_docs_only.outputs.skip != 'true'
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-sample-go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
jobs:
check_docs_only:
name: check_docs_only
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
skip: ${{ steps.check_docs_only.outputs.skip }}
steps:
Expand All @@ -22,7 +22,7 @@ jobs:

e2e:
name: e2e
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: check_docs_only
if: needs.check_docs_only.outputs.skip != 'true'
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-sanity.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
jobs:
check_docs_only:
name: check_docs_only
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
skip: ${{ steps.check_docs_only.outputs.skip }}
steps:
Expand All @@ -22,7 +22,7 @@ jobs:

sanity:
name: sanity
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: check_docs_only
if: needs.check_docs_only.outputs.skip != 'true'
steps:
Expand All @@ -43,7 +43,7 @@ jobs:

docs:
name: docs
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
with:
Expand Down
58 changes: 29 additions & 29 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ require (
github.com/kr/text v0.2.0
github.com/markbates/inflect v1.0.4
github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2
github.com/onsi/ginkgo/v2 v2.23.2
github.com/onsi/gomega v1.36.2
github.com/onsi/ginkgo/v2 v2.23.3
github.com/onsi/gomega v1.36.3
github.com/operator-framework/ansible-operator-plugins v1.37.2
github.com/operator-framework/api v0.27.0
github.com/operator-framework/operator-lib v0.16.0
Expand All @@ -28,24 +28,25 @@ require (
github.com/stretchr/testify v1.10.0
github.com/thoas/go-funk v0.9.3
golang.org/x/mod v0.24.0
golang.org/x/text v0.23.0
golang.org/x/tools v0.31.0
golang.org/x/text v0.24.0
golang.org/x/tools v0.32.0
gomodules.xyz/jsonpatch/v3 v3.0.1
helm.sh/helm/v3 v3.16.3
k8s.io/api v0.31.7
k8s.io/apiextensions-apiserver v0.31.7
k8s.io/apimachinery v0.31.7
k8s.io/api v0.32.2
k8s.io/apiextensions-apiserver v0.32.2
k8s.io/apimachinery v0.32.2
k8s.io/cli-runtime v0.31.7
k8s.io/client-go v0.31.7
k8s.io/client-go v0.32.2
k8s.io/kubectl v0.31.7
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
sigs.k8s.io/controller-runtime v0.19.7
sigs.k8s.io/controller-tools v0.16.5
sigs.k8s.io/kubebuilder/v4 v4.2.0
sigs.k8s.io/controller-tools v0.17.2
sigs.k8s.io/kubebuilder/v4 v4.5.2
sigs.k8s.io/yaml v1.4.0
)

require (
cel.dev/expr v0.18.0 // indirect
dario.cat/mergo v1.0.1 // indirect
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
Expand Down Expand Up @@ -123,9 +124,9 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/cel-go v0.20.1 // indirect
github.com/google/cel-go v0.22.0 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/go-containerregistry v0.20.1 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
Expand All @@ -144,7 +145,6 @@ require (
github.com/hashicorp/golang-lru/arc/v2 v2.0.5 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.5 // indirect
github.com/huandu/xstrings v1.5.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/jmoiron/sqlx v1.4.0 // indirect
Expand All @@ -167,7 +167,7 @@ require (
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/moby/locker v1.0.1 // indirect
github.com/moby/spdystream v0.4.0 // indirect
github.com/moby/spdystream v0.5.0 // indirect
github.com/moby/sys/capability v0.4.0 // indirect
github.com/moby/sys/mountinfo v0.7.2 // indirect
github.com/moby/sys/sequential v0.5.0 // indirect
Expand Down Expand Up @@ -236,35 +236,35 @@ require (
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.starlark.net v0.0.0-20230612165344-9532f5667272 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/crypto v0.36.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.37.0 // indirect
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
golang.org/x/net v0.37.0 // indirect
golang.org/x/net v0.39.0 // indirect
golang.org/x/oauth2 v0.24.0 // indirect
golang.org/x/sync v0.12.0 // indirect
golang.org/x/sys v0.31.0 // indirect
golang.org/x/term v0.30.0 // indirect
golang.org/x/time v0.6.0 // indirect
golang.org/x/sync v0.13.0 // indirect
golang.org/x/sys v0.32.0 // indirect
golang.org/x/term v0.31.0 // indirect
golang.org/x/time v0.7.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
gomodules.xyz/orderedmap v0.1.0 // indirect
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/grpc v1.68.1 // indirect
google.golang.org/protobuf v1.36.1 // indirect
google.golang.org/protobuf v1.36.5 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.31.7 // indirect
k8s.io/component-base v0.31.7 // indirect
k8s.io/apiserver v0.32.2 // indirect
k8s.io/component-base v0.32.2 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
oras.land/oras-go v1.2.5 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
sigs.k8s.io/kustomize/api v0.17.2 // indirect
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
)
Loading
Loading