-
Notifications
You must be signed in to change notification settings - Fork 3.9k
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
chore(eks): support Amazon Linux 2023 #29335
Merged
Merged
Conversation
This file contains 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
github-actions
bot
added
feature-request
A feature should be added or improved.
p2
labels
Mar 1, 2024
jfuss
approved these changes
Mar 1, 2024
AWS CodeBuild CI Report
Powered by github-codebuild-logs, available on the AWS Serverless Application Repository |
Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork). |
1 task
mergify bot
pushed a commit
that referenced
this pull request
Mar 26, 2024
…r AL2023 AMIs (#29505) ### Issue # (if applicable) Closes #29546 ### Reason for this change After #29335, `@aws-eks` should receive AL2023 support, despites the [GPU types are not yet supported](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-amitype) it should at least allow user to customize instance type. However, missing support for `NodegroupAmiType[]` causing validation error emit, so that user can only create [default instance types](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-instancetypes) ( `t3.medium` or `t4g.medium` ). ``` $ cat ./lib/cluster.ts ... cluster.addNodegroupCapacity("mng-al2023", { amiType: eks.NodegroupAmiType.AL2023_X86_64_STANDARD, instanceTypes: [new ec2.InstanceType("t3.medium")], ... }); ... ``` ``` $ npx cdk version 2.133.0 (build dcc1e75) ``` ``` $ npx cdk synth ... ^ Error: The specified AMI does not match the instance types architecture, either specify one of AL2_X86_64, BOTTLEROCKET_X86_64, WINDOWS_CORE_2019_X86_64, WINDOWS_CORE_2022_X86_64, WINDOWS_FULL_2019_X86_64, WINDOWS_FULL_2022_X86_64 or don't specify any at new Nodegroup (.../node_modules/aws-cdk-lib/aws-eks/lib/managed-nodegroup.js:1:3921) at Cluster.addNodegroupCapacity (.../node_modules/aws-cdk-lib/aws-eks/lib/cluster.js:1:19807) at EksCluster.createManagedNodeGroups (.../lib/cluster.ts:85:13) at new EksCluster (.../lib/cluster.ts:30:10) at Object.<anonymous> (.../bin/eks-basic.ts:10:1) at Module._compile (node:internal/modules/cjs/loader:1376:14) at Module.m._compile (.../node_modules/ts-node/src/index.ts:1618:23) at Module._extensions..js (node:internal/modules/cjs/loader:1435:10) at Object.require.extensions.<computed> [as .ts] (.../node_modules/ts-node/src/index.ts:1621:12) at Module.load (node:internal/modules/cjs/loader:1207:32) Subprocess exited with error 1 ``` ### Description of changes Add `eks.NodegroupAmiType.AL2023_X86_64_STANDARD` and `eks.NodegroupAmiType.AL2023_ARM_64_STANDARD` support for node group module. ### Description of how you validated changes ``` $ npx jest aws-eks/test/cluster.test.ts PASS aws-eks/test/cluster.test.ts (37.298 s) ... =============================== Coverage summary =============================== Statements : 48.86% ( 10077/20621 ) Branches : 27.88% ( 2388/8565 ) Functions : 33.03% ( 1509/4568 ) Lines : 49.71% ( 9905/19923 ) ================================================================================ Jest: "global" coverage threshold for statements (55%) not met: 48.86% Jest: "global" coverage threshold for branches (35%) not met: 27.88% Test Suites: 1 passed, 1 total Tests: 119 passed, 119 total Snapshots: 0 total Time: 41.064 s ``` ``` $ npx jest aws-eks/test/nodegroup.test.ts RUNS aws-eks/test/nodegroup.test.ts ... =============================== Coverage summary =============================== Statements : 43.94% ( 9062/20621 ) Branches : 22.08% ( 1892/8565 ) Functions : 27.16% ( 1241/4568 ) Lines : 44.8% ( 8927/19923 ) ================================================================================ Jest: "global" coverage threshold for statements (55%) not met: 43.94% Jest: "global" coverage threshold for branches (35%) not met: 22.08% Test Suites: 1 passed, 1 total Tests: 59 passed, 59 total Snapshots: 0 total Time: 23.334 s ``` ### Checklist - [X] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
This was referenced May 23, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
contribution/core
This is a PR that came from AWS.
feature-request
A feature should be added or improved.
p2
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.
Issue # (if applicable)
Closes #29334
Reason for this change
To support Amazon Linux 2023 nodegroup.
Description of changes
Allow the AmiType to select Amazon Linux 2023 for both x86_64 and ARM_64.
Description of how you validated changes
Checklist
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license