Skip to content

✨ Add AWSMachines to back the EC2 instances in AWSMachinePools and AWSManagedMachinePools #5319

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 1 commit into from
Mar 13, 2025
Merged

✨ Add AWSMachines to back the EC2 instances in AWSMachinePools and AWSManagedMachinePools #5319

merged 1 commit into from
Mar 13, 2025

Conversation

@AndiDog
Copy link
Contributor

@AndiDog AndiDog commented Jan 22, 2025

What type of PR is this?

/kind feature

What this PR does / why we need it:

Replaces #5174 because of branch issues.

This implements the CAPI MachinePool Machines proposal.

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 #4184

Special notes for your reviewer:

Revival of #4527. I took @cnmcavoy's great effort and got it fully working. I tested EC2 cluster creation, machine deletion by user, instance creation and termination by ASG scaling, instance termination by user, ...

Checklist:

  • squashed commits
  • includes documentation
  • includes emojis
  • adds unit tests
  • adds or updates e2e tests

Release note:

Add AWSMachines to back the EC2 instances in AWSMachinePools and AWSManagedMachinePools

/assign cnmcavoy
(original author)
/assign richardcase

(CC @sl1pm4t since you were on the previous instance of this PR)

@k8s-ci-robot k8s-ci-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Jan 22, 2025
@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 22, 2025
@k8s-ci-robot k8s-ci-robot added needs-priority size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jan 22, 2025
@AndiDog
Copy link
Contributor Author

AndiDog commented Jan 22, 2025

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

@AndiDog AndiDog force-pushed the awsmachinepool-awsmachines branch from 3ff118b to 3b9f60f Compare January 22, 2025 17:24
@AndiDog
Copy link
Contributor Author

AndiDog commented Jan 22, 2025

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

@AndiDog
Copy link
Contributor Author

AndiDog commented Jan 23, 2025

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

richardcase
richardcase reviewed Jan 27, 2025
View reviewed changes
fiunchinho
fiunchinho reviewed Jan 27, 2025
View reviewed changes
Copy link
Contributor

@fiunchinho fiunchinho left a comment

Choose a reason for hiding this comment

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

Apart from Richard's open question, looks good to me

@AndiDog AndiDog mentioned this pull request Jan 28, 2025
Closed
@AndiDog AndiDog force-pushed the awsmachinepool-awsmachines branch 2 times, most recently from 8a28998 to 170c635 Compare January 28, 2025 12:44
fiunchinho
fiunchinho approved these changes Jan 28, 2025
View reviewed changes
Copy link
Contributor

@fiunchinho fiunchinho left a comment

Choose a reason for hiding this comment

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

/lgtm

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

AndiDog commented Jan 29, 2025

Test logs gone??

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

@richardcase
Copy link
Member

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

@AndiDog
Copy link
Contributor Author

AndiDog commented Feb 6, 2025

@richardcase Tests have passed

@Ankitasw
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 28, 2025
@richardcase
Copy link
Member

As @AndiDog is out, we may have to add a commit to his branch. wdyt @nrb @damdo ?

@damdo
Copy link
Member

damdo commented Mar 5, 2025

Do we know when @AndiDog will be back? Does this need to be in 2.8?

@AndiDog
Copy link
Contributor Author

AndiDog commented Mar 5, 2025

I can do the rebasing. Probably not today, though.

@damdo
Copy link
Member

damdo commented Mar 6, 2025

Ok thanks @AndiDog

@AndiDog AndiDog force-pushed the awsmachinepool-awsmachines branch from 170c635 to c1c79ba Compare March 6, 2025 22:07
@k8s-ci-robot k8s-ci-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Mar 6, 2025
@AndiDog
Copy link
Contributor Author

AndiDog commented Mar 7, 2025

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

1 similar comment
@fiunchinho
Copy link
Contributor

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

@AndiDog
Copy link
Contributor Author

AndiDog commented Mar 8, 2025

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

@richardcase
Copy link
Member

richardcase commented Mar 10, 2025 •
edited
Loading

It's weird it can't find the latest version. Looking at the artifacts it's still using version v2.0.99 but this was changed recently to v9.9.99.

@AndiDog
Copy link
Contributor Author

AndiDog commented Mar 10, 2025

Trying again with v9.9.99:

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

@AndiDog AndiDog force-pushed the awsmachinepool-awsmachines branch from 1731fa5 to 3d7c9a8 Compare March 11, 2025 15:41
@nrb
Copy link
Contributor

nrb commented Mar 11, 2025

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nrb

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 Mar 11, 2025
@fiunchinho
Copy link
Contributor

/lgtm

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

/retest

@k8s-ci-robot k8s-ci-robot merged commit ab6be84 into kubernetes-sigs:main Mar 13, 2025
17 checks passed
@AndiDog AndiDog mentioned this pull request Jul 2, 2025
Merged
5 tasks
@AndiDog AndiDog mentioned this pull request Jul 16, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@richardcase richardcase richardcase left review comments

@faiq faiq Awaiting requested review from faiq

+1 more reviewer

@fiunchinho fiunchinho fiunchinho approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@richardcase richardcase

@fiunchinho fiunchinho

@cnmcavoy cnmcavoy

@Ankitasw Ankitasw

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/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority 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.

Implement MachinePool Machines clusterAPI proposal

8 participants

@AndiDog @richardcase @Ankitasw @damdo @fiunchinho @nrb @k8s-ci-robot @cnmcavoy