Skip to content

⚠️ Move APIs to ./api #12262

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 10 commits into from
May 23, 2025
Merged

⚠️ Move APIs to ./api #12262

merged 10 commits into from
May 23, 2025

Conversation

sbueringer
Copy link
Member

@sbueringer sbueringer commented May 21, 2025 •
edited
Loading

What this PR does / why we need it:

Tasks:

  • Move all API folders
    • ./api/addons
    • ./exp/ipam/api => api/ipam
    • ./exp/runtime/api => api/runtime
    • ./api/ => ./api/core/
    • ./exp/api => ./api/core/
    • ./bootstrap/kubeadm/api => ./api/bootstrap/kubeadm
    • ./controlplane/kubeadm/api => ./api/controlplane/kubeadm
    • ./exp/runtime/hooks/api => api/runtime/hooks
  • Also align internal/apis
  • Extend migration doc
  • => regen from scratch (cleanup manually)

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 #12203
Part of #11947

@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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-area PR is missing an area label size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels May 21, 2025
@k8s-ci-robot k8s-ci-robot requested review from elmiko and g-gaston May 21, 2025 17:01
@sbueringer sbueringer mentioned this pull request May 21, 2025
Open
66 tasks
@sbueringer sbueringer added the area/api Issues or PRs related to the APIs label May 21, 2025
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/needs-area PR is missing an area label label May 21, 2025
@elmiko
Copy link
Contributor

elmiko commented May 21, 2025

discussing this today at the office hours, Stefan would like to hold off on other merges until this can land. unless those PRs don't touch this at all.

@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-main

@sbueringer sbueringer changed the title [WIP] ⚠️ Move APIs to ./api ⚠️ Move APIs to ./api May 22, 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 May 22, 2025
@sbueringer
Copy link
Member Author

/assign @fabriziopandini @chrischdi @JoelSpeed

The idea would be to merge this if somehow possible in the next 1-2 days to unblock all other PRs (alpha is scheduled for Tuesday next week)

@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-33-1-34-main

@kubernetes-sigs kubernetes-sigs deleted a comment from k8s-ci-robot May 22, 2025
chrischdi
chrischdi reviewed May 22, 2025
View reviewed changes
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 22, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 9e379f1c94ec84cb9adde96af0cb119d21909424

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 22, 2025
@k8s-ci-robot k8s-ci-robot requested a review from chrischdi May 22, 2025 09:53
@sbueringer
Copy link
Member Author

sbueringer commented May 22, 2025 •
edited
Loading

Pushed changes to the migration doc and a small fix for deep copy gen for internal APIs of CABPK + KCP. But now I'm done :)

@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-33-1-34-main

@sbueringer sbueringer mentioned this pull request May 22, 2025
Merged
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-main

Flake, was green before the last 2 commits

This was referenced May 22, 2025
Merged
Merged
Merged
Merged
@fabriziopandini fabriziopandini mentioned this pull request May 22, 2025
Open
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-33-1-34-main

@fabriziopandini
Copy link
Member

Awesome work!
This greatly improves discoverability of our APIs for people looking at our repo!
/lgtm

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

LGTM label has been added.

Git tree hash: 271fe77573cdd5885532c8b987aed9367da1c04f

This was referenced May 22, 2025
Merged
Merged
Merged
@sbueringer
Copy link
Member Author

Let's merge to unblock all the other PRs. I can follow up if there are more findings

@chrischdi
Copy link
Member

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chrischdi

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 23, 2025
@k8s-ci-robot k8s-ci-robot merged commit 70d67eb into kubernetes-sigs:main May 23, 2025
23 of 24 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.11 milestone May 23, 2025
@sbueringer sbueringer deleted the pr-move-apis branch May 23, 2025 07:40
sbueringer
sbueringer commented May 23, 2025
View reviewed changes
docs/book/src/developer/providers/migrations/v1.10-to-v1.11.md
@@ -54,8 +54,25 @@ proposal because most of the changes described below are a consequence of the wo

## API Changes

- APIs have been moved to the top-level `api` folder (https://github.com/kubernetes-sigs/cluster-api/pull/12262).
Copy link
Member Author

Choose a reason for hiding this comment

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

Adding the apiGroups in a follow-up PR: #12266

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@elmiko elmiko Awaiting requested review from elmiko

@g-gaston g-gaston Awaiting requested review from g-gaston

@fabriziopandini fabriziopandini Awaiting requested review from fabriziopandini

@JoelSpeed JoelSpeed Awaiting requested review from JoelSpeed

@chrischdi chrischdi Awaiting requested review from chrischdi

Assignees

@chrischdi chrischdi

@fabriziopandini fabriziopandini

@JoelSpeed JoelSpeed

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/api Issues or PRs related to the APIs 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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
v1.11
Development

Successfully merging this pull request may close these issues.

Move APIs into a central location
6 participants
@sbueringer @elmiko @chrischdi @k8s-ci-robot @fabriziopandini @JoelSpeed