Skip to content
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

✨ Add the support for capacity blocks #5211

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

✨ Add the support for capacity blocks #5211

wants to merge 1 commit into from

Conversation

athiruma
Copy link
Contributor

@athiruma athiruma commented Nov 8, 2024 •
edited by AndiDog
Loading

What type of PR is this?
/kind feature

What this PR does / why we need it:
This PR added the support for CapacityBlocks for ML, by adding this we can get the support for capacity reservations of capacity blocks for ML provided by AWS.

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

Special notes for your reviewer:

Checklist:

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

Release note:

Support running EC2 instances from a reserved capacity block (new API field `useCapacityBlock`)

@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/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-priority needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 8, 2024
@k8s-ci-robot
Copy link
Contributor

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

@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 8, 2024
damdo
damdo reviewed Nov 8, 2024
View reviewed changes
Copy link
Member

@damdo damdo left a comment

Choose a reason for hiding this comment

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

Thank you for your PR @athiruma 👍
Left some suggestions to improve the overall readability.

pkg/cloud/services/ec2/instances.go Outdated Show resolved Hide resolved
api/v1beta2/awsmachine_types.go Outdated Show resolved Hide resolved
api/v1beta2/types.go Outdated Show resolved Hide resolved
pkg/cloud/services/ec2/instances_test.go Outdated Show resolved Hide resolved
pkg/cloud/services/ec2/instances_test.go Show resolved Hide resolved
pkg/cloud/services/ec2/instances_test.go Show resolved Hide resolved
pkg/cloud/services/ec2/instances_test.go Show resolved Hide resolved
pkg/cloud/services/ec2/instances_test.go Outdated Show resolved Hide resolved
@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 Nov 8, 2024
@athiruma
Copy link
Contributor Author

@damdo??

@richardcase
Copy link
Member

/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 Nov 12, 2024
@athiruma
Copy link
Contributor Author

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

@damdo
Copy link
Member

damdo commented Nov 12, 2024

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

@damdo
Copy link
Member

damdo commented Nov 12, 2024

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

@damdo
Copy link
Member

damdo commented Nov 12, 2024

@athiruma The pull-cluster-api-provider-aws-e2e is failing on a the CloudFormation timeout.
We've just increased the timeout in #5193 so if you rebase this PR on the latest main you should pick up the bumped timeout and hopefully this will increase the chances of the e2e to pass.

@damdo
Copy link
Member

damdo commented Nov 12, 2024

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

@athiruma
Copy link
Contributor Author

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

1 similar comment
@athiruma
Copy link
Contributor Author

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

@damdo
Copy link
Member

damdo commented Nov 12, 2024

The eks test is still flakey. I'll take a look at it tomorrow, I think I know where we can improve it

@athiruma
Copy link
Contributor Author

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

@damdo
Copy link
Member

damdo commented Nov 14, 2024

@athiruma see #5215 to improve some issues in the EKS tests

@damdo
Copy link
Member

damdo commented Nov 20, 2024

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

AndiDog
AndiDog reviewed Nov 20, 2024
View reviewed changes
api/v1beta2/awsmachine_types.go Outdated Show resolved Hide resolved
pkg/cloud/services/ec2/instances.go Outdated Show resolved Hide resolved
pkg/cloud/services/ec2/instances.go Show resolved Hide resolved
pkg/cloud/services/ec2/instances.go Show resolved Hide resolved
api/v1beta2/awsmachine_types.go Outdated Show resolved Hide resolved
pkg/cloud/services/ec2/helper_test.go Outdated Show resolved Hide resolved
pkg/cloud/services/ec2/instances_test.go Outdated Show resolved Hide resolved
pkg/cloud/services/ec2/instances_test.go Outdated Show resolved Hide resolved
pkg/cloud/services/ec2/launchtemplate_test.go Outdated Show resolved Hide resolved
pkg/cloud/services/ec2/launchtemplate_test.go Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 20, 2024
@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 ask for approval from andidog. For more information see the Kubernetes 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

@nrb
Copy link
Contributor

nrb commented Nov 20, 2024

/lgtm

Will leave final approval to @AndiDog; it appears to me that most of the comments were addressed. For the one that isn't, I am ok with the code as is presented here, but can see an argument for addressing things now, too.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 20, 2024
AndiDog
AndiDog reviewed Nov 21, 2024
View reviewed changes
Copy link
Contributor

@AndiDog AndiDog left a comment

Choose a reason for hiding this comment

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

Only easy things left, then we're ready here. But tests should succeed, so let's retrigger them after the next push. Please ensure it remains a single commit.

Also, please fix the typo in the commit message and PR title. The release notes in the PR description also have to be changed after the field rename.

api/v1beta2/awsmachine_webhook.go Outdated Show resolved Hide resolved
pkg/cloud/services/ec2/launchtemplate.go Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 21, 2024
@athiruma athiruma changed the title ✨ Added the suport for capacity blocks ✨ Added the support for capacity blocks Nov 21, 2024
@athiruma
Copy link
Contributor Author

Only easy things left, then we're ready here. But tests should succeed, so let's retrigger them after the next push. Please ensure it remains a single commit.

Also, please fix the typo in the commit message and PR title. The release notes in the PR description also have to be changed after the field rename.

done.

@AndiDog AndiDog changed the title ✨ Added the support for capacity blocks ✨ Add the support for capacity blocks Nov 21, 2024
@AndiDog
Copy link
Contributor

AndiDog commented Nov 21, 2024

/lgtm
/retest

Thanks, that was an easy review since I could tick off all done comments so quickly! Let's see if E2E tests pass and then we can merge.

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

AndiDog commented Nov 21, 2024

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

@athiruma
Copy link
Contributor Author

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

2 similar comments
@athiruma
Copy link
Contributor Author

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

@damdo
Copy link
Member

damdo commented Nov 21, 2024

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

@damdo
Copy link
Member

damdo commented Nov 21, 2024

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

@athiruma
Copy link
Contributor Author

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

@damdo
Copy link
Member

damdo commented Nov 22, 2024

@athiruma the EKS tests are broken at the moment.
Not sure about the normal E2Es, it looks like it keeps failing on upgrades with that one..
Could this impact that 🤔 or is it a flake?

WDYT @AndiDog

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

@nrb
Copy link
Contributor

nrb commented Nov 22, 2024

It could be that the updates are just longer by the nature of the test, so they're hitting timeouts more often. I don't think the failures are related to this change.

@athiruma
Copy link
Contributor Author

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

@athiruma
Copy link
Contributor Author

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

@nrb
Copy link
Contributor

nrb commented Nov 25, 2024

/retest

@athiruma
Copy link
Contributor Author

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

@k8s-ci-robot
Copy link
Contributor

@athiruma: The following tests 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 c975830 link false /test pull-cluster-api-provider-aws-e2e
pull-cluster-api-provider-aws-e2e-eks c975830 link false /test pull-cluster-api-provider-aws-e2e-eks

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.

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

@damdo damdo damdo left review comments

@AndiDog AndiDog AndiDog left review comments

@nrb nrb nrb left review comments

@dlipovetsky dlipovetsky Awaiting requested review from dlipovetsky

@richardcase richardcase Awaiting requested review from richardcase

Assignees

@nrb nrb

@AndiDog AndiDog

@dlipovetsky dlipovetsky

@damdo damdo

@Ankitasw Ankitasw

Labels
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 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.
8 participants
@athiruma @k8s-ci-robot @richardcase @damdo @nrb @AndiDog @dlipovetsky @Ankitasw