Skip to content

Bump CAPI to v1.10.0-rc.0 #5517

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.

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 1 commit into
base: main
Choose a base branch
from
Open

Conversation

tamalsaha
Copy link

@tamalsaha tamalsaha commented Mar 26, 2025

What type of PR is this?

What this PR does / why we need it:
As the title suggests, I am updating k/k libs. Requires Azure/azure-service-operator#4646

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:

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests
  • cherry-pick candidate

Release note:

NONE

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Mar 26, 2025
@k8s-ci-robot
Copy link
Contributor

Welcome @tamalsaha!

It looks like this is your first PR to kubernetes-sigs/cluster-api-provider-azure 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api-provider-azure has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Mar 26, 2025
@k8s-ci-robot
Copy link
Contributor

Hi @tamalsaha. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Mar 26, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign neolit123 for approval. For more information see the Code Review Process.

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

Needs approval from an approver in each of these files:

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

@nawazkh
Copy link
Member

nawazkh commented Mar 26, 2025

5000+ changes?! 😱

@tamalsaha
Copy link
Author

tamalsaha commented Mar 26, 2025

Whatever go mod vendor; go mod tidy giveth.

The real change is the fixes needed for the Validator and Defaulter api breakage by the controller-runtime.

@nawazkh
Copy link
Member

nawazkh commented Mar 26, 2025

Whatever go mod vendor; go mod tidy giveth.

Thanks for the update! Just an FYI: Cluster API Provider Azure doesn’t vendor its dependencies, we rely on Go modules and our go.mod/go.sum files for dependency management.

@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Mar 27, 2025
@tamalsaha
Copy link
Author

Removed the vendor folder. PTAL.

Just curious why the vendor folder is not added to the .gitignore.


// ValidateCreate implements webhook.CustomValidator so a webhook will be registered for the type.
func (r *AzureMachineTemplate) ValidateCreate(_ context.Context, obj runtime.Object) (admission.Warnings, error) {
func (_ *azureMachineTemplateWebhook) ValidateCreate(_ context.Context, obj runtime.Object) (admission.Warnings, error) {
Copy link
Author

Choose a reason for hiding this comment

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

The code on the left looks suspect. Some lines modify the receiver object, some lines modify the input parameter obj. Now, all lines modify the input parameter.

@tamalsaha tamalsaha force-pushed the k132 branch 2 times, most recently from 13b70ca to d360b1e Compare March 28, 2025 21:05
@willie-yao
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 31, 2025
@nawazkh
Copy link
Member

nawazkh commented Mar 31, 2025

Just curious why the vendor folder is not added to the .gitignore.

I did not find a historical reason for this, so I cannot really guess either.
Getting vendor/ ignored via .gitignore will be a welcome change. Please feel free to update gitignore via this PR, although I request you to add it in a separate commit and not squash the commit updating gitignore before merging.

go.mod Outdated
Comment on lines 3 to 5
go 1.23.2

toolchain go1.22.12
toolchain go1.24.1
Copy link
Member

Choose a reason for hiding this comment

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

CAPZ's go version updates are driven by CAPI minor updates.
Currently CAPZ main is at CAPI v1.9.x. Once we merge CAPI v1.10.0, we can review this PR (Reference: https://github.com/kubernetes-sigs/cluster-api/blob/release-1.10/go.mod#L3)
/hold

Copy link
Member

Choose a reason for hiding this comment

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

@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 Mar 31, 2025
@k8s-ci-robot k8s-ci-robot requested a review from Jont828 March 31, 2025 18:22
sigs.k8s.io/yaml v1.4.0 // indirect
)

replace github.com/Azure/azure-service-operator/v2 => github.com/Azure/azure-service-operator/v2 v2.12.1-0.20250328191251-ba00156bcd68
Copy link
Member

Choose a reason for hiding this comment

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

Sorry I don't fully understand this. Is there a specific reason to be pinning github.com/Azure/azure-service-operator/v2 v1.12.0 to a specific SHA v2.12.1-0.20250328191251-ba00156bcd68 ?

Copy link
Member

Choose a reason for hiding this comment

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

Also, does updating ASO version also require us to update API Versions at CAPZ, @nojnhuh ?

Copy link
Contributor

Choose a reason for hiding this comment

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

We generally should not be pinning to untagged commits for ASO because we also pull in their YAML manifests and CRDs from tagged releases. I don't think those are available for every commit. The ones from the closest release might work, but we we don't need to be in the business of verifying those things ourselves. Let's wait to update ASO until they tag a release with the new controller-runtime.

Copy link
Author

@tamalsaha tamalsaha Apr 14, 2025

Choose a reason for hiding this comment

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

The kubebuilder api breakage also affects the ASO repo. This is the first commit where this was fixed.

Azure/azure-service-operator#4646

Once they have a proper tag that should be used. But there is no tag since ASO pr was merged.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 8, 2025
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 14, 2025
@tamalsaha tamalsaha changed the title Update to k8s 1.32 client libs Bump CAPI to v1.10.0-rc.0 Apr 14, 2025
Signed-off-by: Tamal Saha <[email protected]>
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Apr 14, 2025
@tamalsaha
Copy link
Author

Hello, I see that there are 2 more prs in flight that address this issue? #5563 #5533 . If those prs are going to be merged, I can close this one. If this pr going to be merged, let me know. I am back after kubecon.

@k8s-ci-robot
Copy link
Contributor

@tamalsaha: 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-azure-verify f553c5f link true /test pull-cluster-api-provider-azure-verify
pull-cluster-api-provider-azure-e2e f553c5f link true /test pull-cluster-api-provider-azure-e2e
pull-cluster-api-provider-azure-capi-e2e f553c5f link false /test pull-cluster-api-provider-azure-capi-e2e
pull-cluster-api-provider-azure-e2e-aks f553c5f link true /test pull-cluster-api-provider-azure-e2e-aks
pull-cluster-api-provider-azure-test f553c5f link true /test pull-cluster-api-provider-azure-test
pull-cluster-api-provider-azure-apidiff f553c5f link false /test pull-cluster-api-provider-azure-apidiff
pull-cluster-api-provider-azure-e2e-workload-upgrade f553c5f link false /test pull-cluster-api-provider-azure-e2e-workload-upgrade
pull-cluster-api-provider-azure-ci-entrypoint f553c5f link true /test pull-cluster-api-provider-azure-ci-entrypoint

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
Status: Todo
Development

Successfully merging this pull request may close these issues.

5 participants