Skip to content

Conversation

@tamalsaha
Copy link
Contributor

@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 #5491
Fixes #5589

Special notes for your reviewer:

TODOs:

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

Release note:

Bump CAPI to v1.10.2

@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
@nawazkh
Copy link
Member

nawazkh commented Mar 26, 2025

5000+ changes?! 😱

@tamalsaha
Copy link
Contributor 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
Contributor Author

Removed the vendor folder. PTAL.

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

@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.

@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
go.mod Outdated
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
Contributor 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.

Copy link
Contributor

Choose a reason for hiding this comment

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

I ended up doing the same in #5533; I think this is the only way to satisfy dependencies until ASO does another release.

@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
@tamalsaha
Copy link
Contributor Author

Done.

@mboersma
Copy link
Contributor

@tamalsaha apparently there's a vulnerability in the v4 jwt package we need to update so this will pass the security check. This should probably fix it:

go get -u github.com/golang-jwt/jwt/v4

Thanks so much for sticking with this PR! There is a light at the end of this tunnel. 😄

@tamalsaha
Copy link
Contributor Author

I guess it got reverted in the last rebase. Should be fixed now.

@mboersma mboersma added this to the v1.20 milestone May 29, 2025
@mboersma mboersma moved this from Wait-On-Author to Needs Review in CAPZ Planning May 29, 2025
Signed-off-by: Tamal Saha <[email protected]>
@mboersma
Copy link
Contributor

/retest

2 similar comments
@tamalsaha
Copy link
Contributor Author

/retest

@damdo
Copy link
Member

damdo commented May 30, 2025

/retest

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented May 30, 2025

@tamalsaha: The following test 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-apidiff 8f54b2f link false /test pull-cluster-api-provider-azure-apidiff

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.

Copy link
Contributor

@mboersma mboersma left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 30, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 8ce46eca50d5af3fb1973da7cfda9383dacb14ff

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mboersma

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:

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 30, 2025
@mboersma
Copy link
Contributor

/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 May 30, 2025
@k8s-ci-robot k8s-ci-robot merged commit 3625700 into kubernetes-sigs:main May 30, 2025
31 of 32 checks passed
@github-project-automation github-project-automation bot moved this from Needs Review to Done in CAPZ Planning May 30, 2025
@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 May 30, 2025
@mboersma mboersma removed the release-note Denotes a PR that will be considered when it comes time to generate release notes. label May 30, 2025
@tamalsaha tamalsaha deleted the k132 branch May 30, 2025 15:49
@tamalsaha
Copy link
Contributor Author

Thank you @damdo @mboersma for your help getting this merged 🎇 !

@nojnhuh nojnhuh mentioned this pull request Aug 21, 2025
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

MachinePool dataSecretName can't be an empty string. CAPI v1.10.0-beta.0 has been released and is ready for testing

7 participants