Skip to content

fix(eks): use AL2023 nodegroup in eks-cluster-handlers-vpc integ test #39558

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

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

fix(eks): use AL2023 nodegroup in eks-cluster-handlers-vpc integ test #39558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions ...integ.eks-cluster-handlers-vpc.js.snapshot/aws-cdk-eks-handlers-in-vpc-test.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,14 +917,11 @@
"EksAllHandlersInVpcStackNodegroupDefaultCapacityD8DD5ECF": {
"Type": "AWS::EKS::Nodegroup",
"Properties": {
"AmiType": "AL2_x86_64",
"AmiType": "AL2023_x86_64_STANDARD",
"ClusterName": {
"Ref": "EksAllHandlersInVpcStack9ED695D7"
},
"ForceUpdateEnabled": true,
"InstanceTypes": [
"m5.large"
],
"NodeRole": {
"Fn::GetAtt": [
"EksAllHandlersInVpcStackNodegroupDefaultCapacityNodeGroupRoleFFBF949C",
Expand Down
2 changes: 1 addition & 1 deletion ...ng/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.js.snapshot/tree.json
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 9 additions & 1 deletion ...ages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-handlers-vpc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,18 @@ class EksAllHandlersInVpcStack extends Stack {
super(scope, id);

this.node.setContext(EC2_RESTRICT_DEFAULT_SECURITY_GROUP, false);
new eks.Cluster(this, 'EksAllHandlersInVpcStack', {
// create the cluster with no default capacity — nodegroup added separately with AL2023 AMI
// (AL2 is not supported for Kubernetes 1.33+)
const cluster = new eks.Cluster(this, 'EksAllHandlersInVpcStack', {
...getClusterVersionConfig(this),
defaultCapacity: 0,
placeClusterHandlerInVpc: true,
});

cluster.addNodegroupCapacity('DefaultCapacity', {
minSize: 2,
amiType: eks.NodegroupAmiType.AL2023_X86_64_STANDARD,
});
}
}

Expand Down
Loading