Skip to content

Use and reconcile based on CAPI v1beta2 #1554

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

Jump to bottom
Merged
merged 5 commits into from
Nov 12, 2025
Merged

Use and reconcile based on CAPI v1beta2 #1554

merged 5 commits into from
Nov 12, 2025
+299 −485

Conversation

@chrischdi
Copy link
Member

@chrischdi chrischdi commented Nov 10, 2025 •
edited
Loading

What type of PR is this?

/kind other

What this PR does / why we need it:

Does the next step after Bumping to CAPI v1.11 to also reconcile based on CAPI v1beta2 objects.

  • Saves us having conversion calls in kube-apiserver for CAPI v1beta2 <-> v1beta1
  • v1beta1 will be removed at some point in future

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

TODOs:

  • check usage of patch utils
  • check CAPI migration docs for open tasks
  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

Change controllers to reconcile Cluster API v1beta2

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Nov 10, 2025
@netlify
Copy link

netlify bot commented Nov 10, 2025 •
edited
Loading

✅ Deploy Preview for kubernetes-sigs-cluster-api-gcp ready!

Name Link
🔨 Latest commit 27c3e2c
🔍 Latest deploy log https://app.netlify.com/projects/kubernetes-sigs-cluster-api-gcp/deploys/69133d7bd3fd4f0008261f93
😎 Deploy Preview https://deploy-preview-1554--kubernetes-sigs-cluster-api-gcp.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 10, 2025
@k8s-ci-robot k8s-ci-robot requested review from damdo and dims November 10, 2025 14:13
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Nov 10, 2025
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Nov 10, 2025
@chrischdi chrischdi changed the title [WIP] Use and reconcile based on CAPI v1beta2 Use and reconcile based on CAPI v1beta2 Nov 10, 2025
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 10, 2025
@chrischdi
Copy link
Member Author

chrischdi commented Nov 11, 2025

/hold

To not merge automatically.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 11, 2025
@chrischdi
Copy link
Member Author

chrischdi commented Nov 11, 2025

/test help

(to see if there are additional jobs)

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Nov 11, 2025

@chrischdi: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test pull-cluster-api-provider-gcp-build

/test pull-cluster-api-provider-gcp-e2e-test

/test pull-cluster-api-provider-gcp-make

/test pull-cluster-api-provider-gcp-test

/test pull-cluster-api-provider-gcp-verify

The following commands are available to trigger optional jobs:

/test pull-cluster-api-provider-gcp-apidiff

/test pull-cluster-api-provider-gcp-capi-e2e

/test pull-cluster-api-provider-gcp-conformance

/test pull-cluster-api-provider-gcp-conformance-ci-artifacts

/test pull-cluster-api-provider-gcp-coverage

/test pull-cluster-api-provider-gcp-e2e-workload-upgrade

Use /test all to run the following jobs that were automatically triggered:

pull-cluster-api-provider-gcp-apidiff

pull-cluster-api-provider-gcp-build

pull-cluster-api-provider-gcp-e2e-test

pull-cluster-api-provider-gcp-make

pull-cluster-api-provider-gcp-test

pull-cluster-api-provider-gcp-verify

In response to this:

/test help

(to see if there are additional jobs)

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@chrischdi
Copy link
Member Author

chrischdi commented Nov 11, 2025

/test pull-cluster-api-provider-gcp-capi-e2e
/test pull-cluster-api-provider-gcp-conformance
/test pull-cluster-api-provider-gcp-conformance-ci-artifacts
/test pull-cluster-api-provider-gcp-e2e-workload-upgrade

@chrischdi
Copy link
Member Author

chrischdi commented Nov 11, 2025

/retest

Unrelated issue, maybe the job is broken

@chrischdi
Copy link
Member Author

chrischdi commented Nov 11, 2025

Is pull-cluster-api-provider-gcp-e2e-workload-upgrade broken because of not having CCM deployed?

@chrischdi
Copy link
Member Author

chrischdi commented Nov 11, 2025

/test pull-cluster-api-provider-gcp-e2e-workload-upgrade
/test pull-cluster-api-provider-gcp-conformance
/test pull-cluster-api-provider-gcp-capi-e2e

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Nov 11, 2025

@chrischdi: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-provider-gcp-conformance-ci-artifacts eb0efe6 link false /test pull-cluster-api-provider-gcp-conformance-ci-artifacts
pull-cluster-api-provider-gcp-apidiff 27c3e2c link false /test pull-cluster-api-provider-gcp-apidiff
pull-cluster-api-provider-gcp-e2e-workload-upgrade 27c3e2c link false /test pull-cluster-api-provider-gcp-e2e-workload-upgrade

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@chrischdi
Copy link
Member Author

chrischdi commented Nov 12, 2025

These failures are unrelated to the PR @damdo , see
#1556

@chrischdi
Copy link
Member Author

chrischdi commented Nov 12, 2025

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 12, 2025
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 12, 2025
damdo
damdo reviewed Nov 12, 2025
View reviewed changes
Copy link
Member

@damdo damdo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great!
Thanks a lot @chrischdi 😄

/approve
/lgtm

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Nov 12, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chrischdi, cpanato, damdo

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [chrischdi,cpanato,damdo]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@damdo
Copy link
Member

damdo commented Nov 12, 2025

Test timed out

/test pull-cluster-api-provider-gcp-test

@k8s-ci-robot k8s-ci-robot merged commit 1f920d9 into kubernetes-sigs:main Nov 12, 2025
17 of 19 checks passed
@damdo
Copy link
Member

damdo commented Nov 12, 2025

cc. @justinsb

@damdo damdo mentioned this pull request Nov 14, 2025
Open
@tthvo tthvo mentioned this pull request Nov 15, 2025
Open
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Nov 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@damdo damdo damdo left review comments

@cpanato cpanato cpanato approved these changes

@dims dims Awaiting requested review from dims

Assignees

@cpanato cpanato

@damdo damdo

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@chrischdi @k8s-ci-robot @damdo @cpanato