chore: sync with upstream aws/karpenter-provider-aws main#1
Open
jeremywgleeson wants to merge 6 commits intomainfrom
Open
chore: sync with upstream aws/karpenter-provider-aws main#1jeremywgleeson wants to merge 6 commits intomainfrom
jeremywgleeson wants to merge 6 commits intomainfrom
Conversation
aws#8980) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-Authored-By: jeremy <jeremywgleeson@gmail.com>
🤖 Devin AI EngineerI'll be helping with this pull request! Here's what you should know: ✅ I will automatically:
Note: I can only respond to comments from users who have write access to this repository. ⚙️ Control Options:
|
![devin-ai-integration[bot]](https://avatars.githubusercontent.com/in/811515?s=60&v=4){kind=small}
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
chore: sync with upstream aws/karpenter-provider-aws main
Summary
Merges 5 upstream commits from
aws/karpenter-provider-awsmain into the exa fork. The exa-specific commits ([karpenter] Point to local fork of karpenterand[karpenter] Add flake + fix Makefile) are preserved.Key upstream changes:
RequestLimitExceededCreateFleet errors from marking ODCRs unavailable (pkg/providers/instance/instance.go) — now only unfulfillable-capacity errors mark reservations unavailable, preventing throttling from incorrectly disabling capacity reservationsThe
go.sumconflict was resolved by taking upstream's version (git checkout --theirs go.sum).Review & Testing Checklist for Human
go.sumcorrectness: The conflict was resolved by taking upstream'sgo.sumwholesale. Since the exa fork usesreplace sigs.k8s.io/karpenter => ../baseingo.mod, the actual transitive deps may differ from what upstream expects. Rungo mod tidywith the local../basedirectory at the correct commit to regeneratego.sumand confirm it matches.go.modreferences../baseand the core karpenter dependency version has changed upstream. Building with a stale../basemay fail.instance.go) is a behavioral fix — verify this aligns with how exa uses ODCRs in production.Notes
jeremy/rolling-restart-consolidationon updated main → run tests → merge rolling restart