Skip to content

Remove stale CRDs and add missing ASO managed kinds to PROJECT#6285

Merged
k8s-ci-robot merged 1 commit into
kubernetes-sigs:mainfrom
mboersma:crd-and-project-cleanup
May 7, 2026
Merged

Remove stale CRDs and add missing ASO managed kinds to PROJECT#6285
k8s-ci-robot merged 1 commit into
kubernetes-sigs:mainfrom
mboersma:crd-and-project-cleanup

Conversation

@mboersma
Copy link
Copy Markdown
Contributor

@mboersma mboersma commented May 6, 2026

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Cleans up two pieces of generated-output drift in config/crd/bases/ and PROJECT:

  • Deletes three orphaned CRD files left over from old v1alpha3 types that no longer exist in code (the controller-gen.kubebuilder.io/version: v0.3.0 annotation and the typo'd plural identites are giveaways):

    • infrastructure.cluster.x-k8s.io_azureserviceprincipals.yaml
    • infrastructure.cluster.x-k8s.io_azuresystemassignedidentites.yaml
    • infrastructure.cluster.x-k8s.io_azureuserassignedidentites.yaml

    No matching Go types exist (grep -r AzureServicePrincipal --include="*.go" returns nothing) and config/crd/kustomization.yaml doesn't reference them — they're not in the build, just sitting in the tree. controller-gen doesn't delete stale files, so they have to go manually.

  • Appends the six AzureASOManaged* kinds to PROJECT. They were missed when the ASO-managed types were added but they have +kubebuilder:object:root=true markers and CRDs in config/crd/bases/.

make generate produces no further drift on a clean tree after this change.

Which issue(s) this PR fixes:

This narrows the scope of #5391. Posting a separate comment on the issue suggesting the larger "make kubebuilder create api work end-to-end" goal isn't worth pursuing given CAPZ has intentionally diverged from kubebuilder scaffolding (e.g. internal/webhooks/ layout from #6141 and #6280).

Special notes for your reviewer:

None.

TODOs:

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

Release note:

Remove stale CRDs and add missing ASO managed kinds to PROJECT

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. labels May 6, 2026
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 6, 2026
@k8s-ci-robot k8s-ci-robot requested review from Jont828 and nojnhuh May 6, 2026 19:57
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 6, 2026
@codecov
Copy link
Copy Markdown

codecov Bot commented May 6, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 43.95%. Comparing base (f69aa53) to head (9c6d890).
⚠️ Report is 10 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #6285   +/-   ##
=======================================
  Coverage   43.94%   43.95%           
=======================================
  Files         289      289           
  Lines       25351    25351           
=======================================
+ Hits        11141    11143    +2     
+ Misses      13437    13435    -2     
  Partials      773      773           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copy link
Copy Markdown
Contributor

@willie-yao willie-yao 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 6, 2026
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

LGTM label has been added.

DetailsGit tree hash: feb27e0f53dc76dea2c80935a5e79ede49e28326

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: willie-yao

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

The pull request process is described here

Details 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 6, 2026
@k8s-ci-robot k8s-ci-robot merged commit c353188 into kubernetes-sigs:main May 7, 2026
22 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.25 milestone May 7, 2026
@github-project-automation github-project-automation Bot moved this from Todo to Done in CAPZ Planning May 7, 2026
@mboersma mboersma deleted the crd-and-project-cleanup branch May 7, 2026 01:37
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. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. 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/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants