-
Notifications
You must be signed in to change notification settings - Fork 1.2k
ci: add cleanup for leaked capacity reservations #9051
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
+185
−22
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
162 changes: 162 additions & 0 deletions
162
test/hack/resource/pkg/resourcetypes/capacityreservation.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,162 @@ | ||
| /* | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package resourcetypes | ||
|
|
||
| import ( | ||
| "context" | ||
| "time" | ||
|
|
||
| "github.com/aws/aws-sdk-go-v2/aws" | ||
| "github.com/aws/aws-sdk-go-v2/service/ec2" | ||
| ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types" | ||
| "github.com/samber/lo" | ||
| "go.uber.org/multierr" | ||
| ) | ||
|
|
||
| type CapacityReservation struct { | ||
| ec2Client *ec2.Client | ||
| } | ||
|
|
||
| func NewCapacityReservation(ec2Client *ec2.Client) *CapacityReservation { | ||
| return &CapacityReservation{ec2Client: ec2Client} | ||
| } | ||
|
|
||
| func (cr *CapacityReservation) String() string { | ||
| return "CapacityReservations" | ||
| } | ||
|
|
||
| func (cr *CapacityReservation) Global() bool { | ||
| return false | ||
| } | ||
|
|
||
| func (cr *CapacityReservation) GetExpired(ctx context.Context, expirationTime time.Time, excludedClusters []string) (ids []string, err error) { | ||
| reservations, err := cr.getAllCapacityReservations(ctx, &ec2.DescribeCapacityReservationsInput{ | ||
| Filters: []ec2types.Filter{ | ||
| { | ||
| Name: lo.ToPtr("state"), | ||
| Values: []string{string(ec2types.CapacityReservationStateActive)}, | ||
| }, | ||
| }, | ||
| }) | ||
| if err != nil { | ||
| return ids, err | ||
| } | ||
|
|
||
| reservations = lo.Filter(reservations, func(reservation ec2types.CapacityReservation, _ int) bool { | ||
| return lo.FromPtr(reservation.CreateDate).Before(expirationTime) | ||
| }) | ||
| ids = lo.Map(reservations, func(reservation ec2types.CapacityReservation, _ int) string { | ||
| return lo.FromPtr(reservation.CapacityReservationId) | ||
| }) | ||
|
|
||
| return ids, err | ||
| } | ||
|
|
||
| func (cr *CapacityReservation) CountAll(ctx context.Context) (count int, err error) { | ||
| reservations, err := cr.getAllCapacityReservations(ctx, &ec2.DescribeCapacityReservationsInput{ | ||
| Filters: []ec2types.Filter{ | ||
| { | ||
| Name: lo.ToPtr("state"), | ||
| Values: []string{ | ||
| string(ec2types.CapacityReservationStateActive), | ||
| string(ec2types.CapacityReservationStatePending), | ||
| }, | ||
| }, | ||
| }, | ||
| }) | ||
| if err != nil { | ||
| return count, err | ||
| } | ||
|
|
||
| return len(reservations), err | ||
| } | ||
|
|
||
| func (cr *CapacityReservation) Get(ctx context.Context, clusterName string) (ids []string, err error) { | ||
| return ids, nil | ||
| } | ||
|
|
||
| // Cleanup cancels capacity reservations. For IODCRs, it sets the allocation to 0. | ||
| // For ODCRs the reservations are cancelled. | ||
| func (cr *CapacityReservation) Cleanup(ctx context.Context, ids []string) ([]string, error) { | ||
| if len(ids) == 0 { | ||
| return nil, nil | ||
| } | ||
|
|
||
| out, err := cr.ec2Client.DescribeCapacityReservations(ctx, &ec2.DescribeCapacityReservationsInput{ | ||
| CapacityReservationIds: ids, | ||
| }) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| reservationMap := lo.SliceToMap(out.CapacityReservations, func(reservation ec2types.CapacityReservation) (string, ec2types.CapacityReservation) { | ||
| return lo.FromPtr(reservation.CapacityReservationId), reservation | ||
| }) | ||
|
|
||
| var iodcrIDs []string | ||
| var odcrIDs []string | ||
| for _, id := range ids { | ||
| if reservation, exists := reservationMap[id]; exists { | ||
| if reservation.Interruptible != nil && lo.FromPtr(reservation.Interruptible) { | ||
| iodcrIDs = append(iodcrIDs, id) | ||
| } else { | ||
| odcrIDs = append(odcrIDs, id) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| cleaned := make([]string, 0, len(ids)) | ||
| var errs []error | ||
|
|
||
| for _, id := range iodcrIDs { | ||
| _, err := cr.ec2Client.UpdateInterruptibleCapacityReservationAllocation(ctx, &ec2.UpdateInterruptibleCapacityReservationAllocationInput{ | ||
| CapacityReservationId: aws.String(id), | ||
| TargetInstanceCount: aws.Int32(0), | ||
| }) | ||
| if err != nil { | ||
| errs = append(errs, err) | ||
| continue | ||
| } | ||
| cleaned = append(cleaned, id) | ||
| } | ||
|
|
||
| for _, id := range odcrIDs { | ||
| _, err := cr.ec2Client.CancelCapacityReservation(ctx, &ec2.CancelCapacityReservationInput{ | ||
|
ryan-mist marked this conversation as resolved.
|
||
| CapacityReservationId: aws.String(id), | ||
| }) | ||
| if err != nil { | ||
| errs = append(errs, err) | ||
| continue | ||
| } | ||
| cleaned = append(cleaned, id) | ||
| } | ||
|
|
||
| return cleaned, multierr.Combine(errs...) | ||
| } | ||
|
|
||
| func (cr *CapacityReservation) getAllCapacityReservations(ctx context.Context, params *ec2.DescribeCapacityReservationsInput) (reservations []ec2types.CapacityReservation, err error) { | ||
| paginator := ec2.NewDescribeCapacityReservationsPaginator(cr.ec2Client, params) | ||
|
|
||
| for paginator.HasMorePages() { | ||
| page, err := paginator.NextPage(ctx) | ||
| if err != nil { | ||
| return reservations, err | ||
| } | ||
|
|
||
| reservations = append(reservations, page.CapacityReservations...) | ||
| } | ||
|
|
||
| return reservations, nil | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.