Skip to content

WIP ✨ feat: Implement autoscaling from zero by auto-populating AWSMachineTemplate capacity #5711

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
Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

WIP ✨ feat: Implement autoscaling from zero by auto-populating AWSMachineTemplate capacity #5711

wants to merge 3 commits into from

Conversation

@LiangquanLi930
Copy link
Contributor

@LiangquanLi930 LiangquanLi930 commented Oct 15, 2025 •
edited
Loading

✨ Implement autoscaling from zero by auto-populating AWSMachineTemplate capacity

What type of PR is this?
/kind feature

What this PR does / why we need it:
This PR implements the Cluster API autoscaling from zero proposal for CAPA by adding a controller that automatically populates AWSMachineTemplate.Status.Capacity with instance type information.

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:

Checklist:

  • squashed commits
  • includes documentation
  • includes emoji in title
  • adds unit tests
  • adds or updates e2e tests

Release note:

Implement autoscaling from zero by auto-populating AWSMachineTemplate capacity

@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 15, 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 richardcase 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

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Oct 15, 2025
@k8s-ci-robot
Copy link
Contributor

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

@LiangquanLi930 LiangquanLi930 changed the title ✨ Implement autoscaling from zero by auto-populating AWSMachineTemplate capacity WIP ✨ Implement autoscaling from zero by auto-populating AWSMachineTemplate capacity Oct 15, 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 Oct 15, 2025
@elmiko
Copy link

elmiko commented Oct 15, 2025

/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 Oct 15, 2025
@LiangquanLi930 LiangquanLi930 force-pushed the opt-in-autoscaling-from-zero branch 7 times, most recently from f1ee365 to 3be8f4d Compare October 20, 2025 11:21
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Oct 20, 2025
@LiangquanLi930 LiangquanLi930 force-pushed the opt-in-autoscaling-from-zero branch 2 times, most recently from 01be987 to 915f55b Compare October 20, 2025 12:57
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Oct 20, 2025
@LiangquanLi930 LiangquanLi930 force-pushed the opt-in-autoscaling-from-zero branch from 915f55b to b3850d1 Compare October 20, 2025 14:42
@k8s-ci-robot k8s-ci-robot removed the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 20, 2025
chrischdi
chrischdi reviewed Oct 30, 2025
View reviewed changes
controllers/awsmachinetemplate_controller.go Outdated
return ctrl.NewControllerManagedBy(mgr).
For(&infrav1.AWSMachineTemplate{}).
WithOptions(options).
WithEventFilter(predicates.ResourceHasFilterLabel(mgr.GetScheme(), log.GetLogger(), r.WatchFilterValue)).
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
WithEventFilter(predicates.ResourceHasFilterLabel(mgr.GetScheme(), log.GetLogger(), r.WatchFilterValue)).
WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(mgr.GetScheme(), log.GetLogger(), r.WatchFilterValue)).

controllers/awsmachinetemplate_controller.go
// Extract node info from AMI if available
nodeInfo := &infrav1.NodeInfo{}
amiID := template.Spec.Template.Spec.AMI.ID
if amiID != nil && *amiID != "" {
Copy link
Member

Choose a reason for hiding this comment

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

👍

That then requires to lookup the kubernetes version first, which should be set at the parent object (you should be able to get it via the owner reference).

Also this may lead to requiring updates so we should remove not skip in line 72 if ami is not set.

@LiangquanLi930 LiangquanLi930 force-pushed the opt-in-autoscaling-from-zero branch 2 times, most recently from c072937 to 20bad08 Compare October 30, 2025 12:44
@LiangquanLi930
Copy link
Contributor Author

/test pull-cluster-api-provider-aws-e2e

@LiangquanLi930 LiangquanLi930 force-pushed the opt-in-autoscaling-from-zero branch 2 times, most recently from 03ec3b9 to 3c89048 Compare October 30, 2025 16:32
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 30, 2025
@LiangquanLi930 LiangquanLi930 force-pushed the opt-in-autoscaling-from-zero branch 3 times, most recently from b0eae44 to 6ab7428 Compare October 31, 2025 06:06
@k8s-ci-robot k8s-ci-robot added do-not-merge/contains-merge-commits and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Oct 31, 2025
@LiangquanLi930 LiangquanLi930 force-pushed the opt-in-autoscaling-from-zero branch from 6df5996 to 5b5a139 Compare October 31, 2025 07:26
@LiangquanLi930 LiangquanLi930 force-pushed the opt-in-autoscaling-from-zero branch 2 times, most recently from af3844f to 8371031 Compare November 3, 2025 08:43
@LiangquanLi930 LiangquanLi930 changed the title ✨ feat: Implement autoscaling from zero by auto-populating AWSMachineTemplate capacity WIP ✨ feat: Implement autoscaling from zero by auto-populating AWSMachineTemplate capacity Nov 3, 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 Nov 3, 2025
@LiangquanLi930
Copy link
Contributor Author

/test pull-cluster-api-provider-aws-e2e-blocking

@LiangquanLi930
Copy link
Contributor Author

/test pull-cluster-api-provider-aws-e2e

@LiangquanLi930
Copy link
Contributor Author

/test pull-cluster-api-provider-aws-e2e-blocking

@LiangquanLi930 LiangquanLi930 force-pushed the opt-in-autoscaling-from-zero branch 2 times, most recently from 56615b5 to 3bf0acb Compare November 3, 2025 13:23
@LiangquanLi930
Copy link
Contributor Author

/test pull-cluster-api-provider-aws-e2e

@k8s-ci-robot
Copy link
Contributor

@LiangquanLi930: 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-aws-e2e 3bf0acb link false /test pull-cluster-api-provider-aws-e2e

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.

@LiangquanLi930 LiangquanLi930 force-pushed the opt-in-autoscaling-from-zero branch from 3bf0acb to 6897a1f Compare November 3, 2025 17:08
@LiangquanLi930 LiangquanLi930 force-pushed the opt-in-autoscaling-from-zero branch from 6897a1f to ca67a57 Compare November 3, 2025 17:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nrb nrb nrb left review comments

@AndiDog AndiDog Awaiting requested review from AndiDog

@cnmcavoy cnmcavoy Awaiting requested review from cnmcavoy

+2 more reviewers

@elmiko elmiko elmiko left review comments

@chrischdi chrischdi chrischdi left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@elmiko elmiko

Labels

cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. kind/feature Categorizes issue or PR as related to a new feature. needs-priority ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@LiangquanLi930 @k8s-ci-robot @elmiko @nrb @chrischdi