Skip to content

✨ Cleanup exp packages #12651

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

Merged

Conversation

sbueringer
Copy link
Member

@sbueringer sbueringer commented Aug 19, 2025

Signed-off-by: Stefan Büringer [email protected]

What this PR does / why we need it:
As discussed a few times, we want to cleanup our exp packages. This PR moves MachinePool, ExtensionConfig and IPAM webhooks/controllers into their correct packages

(There are no plans to backport this into release-1.11)

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 #

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-area PR is missing an area label labels Aug 19, 2025
@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Aug 19, 2025
@sbueringer sbueringer added area/runtime-sdk Issues or PRs related to Runtime SDK area/ipam Issues or PRs related to ipam area/machinepool Issues or PRs related to machinepools labels Aug 19, 2025
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/needs-area PR is missing an area label label Aug 19, 2025
@sbueringer sbueringer force-pushed the pr-cleanup-exp-package branch from 5351815 to bb8fc8b Compare August 19, 2025 13:07
@sbueringer sbueringer changed the title ✨ Cleanup exp packages [WIP] ✨ Cleanup exp packages Aug 19, 2025
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 19, 2025
@sbueringer sbueringer force-pushed the pr-cleanup-exp-package branch 2 times, most recently from eb95322 to d7fd91e Compare August 19, 2025 13:16
@sbueringer
Copy link
Member Author

@sbueringer sbueringer changed the title [WIP] ✨ Cleanup exp packages ✨ Cleanup exp packages Aug 19, 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 Aug 19, 2025
Signed-off-by: Stefan Büringer [email protected]
@sbueringer sbueringer force-pushed the pr-cleanup-exp-package branch from d7fd91e to 35b28c4 Compare August 19, 2025 13:17
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-main

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Aug 19, 2025

@sbueringer: 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-apidiff-main 35b28c4 link false /test pull-cluster-api-apidiff-main

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.

@richardcase
Copy link
Member

Looks good to me @sbueringer.

/lgtm

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

LGTM label has been added.

Git tree hash: c31ad7f4d756e396f7309e5e94de9622fa2b31ac

Copy link
Member

@sivchari sivchari left a comment

Choose a reason for hiding this comment

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

Thx!
/lgtm

@jackfrancis
Copy link
Contributor

Congrats on reducing the CAPI maintenance burden @sbueringer and to @mboersma @willie-yao @richardcase for your work over several years stabilizing MachinePools in preparation for this!

/lgtm

Copy link
Member

@fabriziopandini fabriziopandini left a comment

Choose a reason for hiding this comment

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

Happy to see another cleanup to the code structure, thanks!

I assume we will get rid of the /exp package under test/infrastructure/docker in a follow up PR, is that right?

Copy link
Member

Choose a reason for hiding this comment

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

Wondering if we should align index management for extension config to what we are doing for other indexes, and move this file + the corresponding test to api/core/v1beta2/index

Copy link
Member Author

Choose a reason for hiding this comment

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

I think I wouldn't export that index and make it part of our API. I'm also not sure who would be consuming that.

Additionally the index is a purely client-side thing anyway so everyone can implement the same or a different index on their side if they want to.

For us this index only makes sense because we inject the caBundle. I'm not aware of use cases for anyone else to be honest

Copy link
Member

@fabriziopandini fabriziopandini Aug 22, 2025

Choose a reason for hiding this comment

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

As discussed, we should move indexes out of the API package, ideally somewhere internal (unless it is required for using some public util func), and then move also the ExtensionConfig index in the target location once it is defined

Considering this, it is ok the keep ExtensionConfig indexes where they are for this PR

@sbueringer
Copy link
Member Author

sbueringer commented Aug 22, 2025

I assume we will get rid of the /exp package under test/infrastructure/docker in a follow up PR, is that right?

In general, we should yes. But I think the effort is higher and the benefit much lower (we barely touch any of that code)

@fabriziopandini
Copy link
Member

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

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 Aug 22, 2025
@sbueringer
Copy link
Member Author

sbueringer commented Aug 22, 2025

Congrats on reducing the CAPI maintenance burden @sbueringer and to @mboersma @willie-yao @richardcase for your work over several years stabilizing MachinePools in preparation for this!

Just to clarify, this was only a code cleanup as we wanted to get rid of exp packages independent of feature state. This is not a sign of graduation of MachinePools. That is tracked and discussed here #9005, and frankly, it is not looking good.

@richardcase
Copy link
Member

That is tracked and discussed here #9005, and frankly, it is not looking good.

There has been a small amount of progress, need to do more and get more help.

@k8s-ci-robot k8s-ci-robot merged commit 44fc7d8 into kubernetes-sigs:main Aug 22, 2025
18 of 19 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.12 milestone Aug 22, 2025
@sbueringer sbueringer deleted the pr-cleanup-exp-package branch August 22, 2025 17:00
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. area/ipam Issues or PRs related to ipam area/machinepool Issues or PRs related to machinepools area/runtime-sdk Issues or PRs related to Runtime SDK 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
Development

Successfully merging this pull request may close these issues.

6 participants