Skip to content

feat(eks): support eks with k8s 1.33 #34602

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

Merged
merged 5 commits into from
Jun 16, 2025
Merged

feat(eks): support eks with k8s 1.33 #34602

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b2c4a5c
init
phuhung273 Jun 1, 2025
b0915e6
Merge branch 'main' into eks-133
phuhung273 Jun 13, 2025
b70b3e0
Merge branch 'main' into eks-133
phuhung273 Jun 16, 2025
e05c22d
convert to LFS pointer
phuhung273 Jun 16, 2025
e05f28a
Merge branch 'main' into eks-133
mergify[bot] Jun 16, 2025
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
1 change: 1 addition & 0 deletions packages/@aws-cdk-testing/framework-integ/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"@aws-cdk/lambda-layer-kubectl-v30": "^2.0.4",
"@aws-cdk/lambda-layer-kubectl-v31": "^2.1.0",
"@aws-cdk/lambda-layer-kubectl-v32": "^2.1.0",
"@aws-cdk/lambda-layer-kubectl-v33": "^2.0.0",
"aws-cdk-lib": "0.0.0",
"cdk8s": "2.69.72",
"cdk8s-plus-27": "2.9.5",
Expand Down
2 changes: 2 additions & 0 deletions ...ages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ-tests-kubernetes-version.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { KubectlV29Layer } from '@aws-cdk/lambda-layer-kubectl-v29';
import { KubectlV30Layer } from '@aws-cdk/lambda-layer-kubectl-v30';
import { KubectlV31Layer } from '@aws-cdk/lambda-layer-kubectl-v31';
import { KubectlV32Layer } from '@aws-cdk/lambda-layer-kubectl-v32';
import { KubectlV33Layer } from '@aws-cdk/lambda-layer-kubectl-v33';
import { Construct } from 'constructs';
import * as eks from 'aws-cdk-lib/aws-eks';

Expand All @@ -15,6 +16,7 @@ const versionMap: { [key: string]: new (scope: Construct, id: string) => lambda.
'1.30': KubectlV30Layer,
'1.31': KubectlV31Layer,
'1.32': KubectlV32Layer,
'1.33': KubectlV33Layer,
};

export function getClusterVersionConfig(scope: Construct, version?: eks.KubernetesVersion) {
Expand Down
Binary file renamed ...417df0fdeb6966645f90c88ec1d7e28130112.zip → ...15444c90346ee68f0067f80037541a4b54d62.zip
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions ...eg.eks-al2023-nodegroup.js.snapshot/aws-cdk-eks-cluster-al2023-nodegroup-test.assets.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions ....eks-al2023-nodegroup.js.snapshot/aws-cdk-eks-cluster-al2023-nodegroup-test.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,9 +434,9 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "6094cb0ff874f89ab5ab24fb6b9417df0fdeb6966645f90c88ec1d7e28130112.zip"
"S3Key": "e995b7fa13f3d9f946ff291512015444c90346ee68f0067f80037541a4b54d62.zip"
},
"Description": "/opt/kubectl/kubectl 1.32.3; /opt/helm/helm 3.17.2",
"Description": "/opt/kubectl/kubectl 1.33.0; /opt/helm/helm 3.18.0",
"LicenseInfo": "Apache-2.0"
}
},
Expand Down Expand Up @@ -755,7 +755,7 @@
]
},
"Config": {
"version": "1.32",
"version": "1.33",
"roleArn": {
"Fn::GetAtt": [
"ClusterRoleFA261979",
Expand Down
2 changes: 1 addition & 1 deletion ...esting/framework-integ/test/aws-eks/test/integ.eks-al2023-nodegroup.js.snapshot/tree.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-al2023-nodegroup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class EksClusterStack extends Stack {
vpc: this.vpc,
mastersRole,
defaultCapacity: 0,
...getClusterVersionConfig(this, eks.KubernetesVersion.V1_32),
...getClusterVersionConfig(this, eks.KubernetesVersion.V1_33),
});

// create nodegroup with AL2023_X86_64_STANDARD
Expand Down Expand Up @@ -65,4 +65,3 @@ new integ.IntegTest(app, 'aws-cdk-eks-cluster-al2023-nodegroup', {
// Test includes assets that are updated weekly. If not disabled, the upgrade PR will fail.
diffAssets: false,
});
app.synth();
Binary file renamed ...1caf43fd9850063641b4d78bf30fbe6b4d381.zip → ...15444c90346ee68f0067f80037541a4b54d62.zip
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions ...est/integ.fargate-cluster.js.snapshot/aws-cdk-eks-fargate-cluster-test-stack1.assets.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions ...t/integ.fargate-cluster.js.snapshot/aws-cdk-eks-fargate-cluster-test-stack1.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,9 +402,9 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "9953ad4c3e84d120643ece4b2e51caf43fd9850063641b4d78bf30fbe6b4d381.zip"
"S3Key": "e995b7fa13f3d9f946ff291512015444c90346ee68f0067f80037541a4b54d62.zip"
},
"Description": "/opt/kubectl/kubectl 1.30; /opt/helm/helm 3.17.1",
"Description": "/opt/kubectl/kubectl 1.33.0; /opt/helm/helm 3.18.0",
"LicenseInfo": "Apache-2.0"
}
},
Expand Down Expand Up @@ -731,7 +731,7 @@
]
},
"Config": {
"version": "1.30",
"version": "1.33",
"roleArn": {
"Fn::GetAtt": [
"FargateClusterRole8E36B33A",
Expand Down
6 changes: 3 additions & 3 deletions ...est/integ.fargate-cluster.js.snapshot/aws-cdk-eks-fargate-cluster-test-stack2.assets.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions ...t/integ.fargate-cluster.js.snapshot/aws-cdk-eks-fargate-cluster-test-stack2.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "9953ad4c3e84d120643ece4b2e51caf43fd9850063641b4d78bf30fbe6b4d381.zip"
"S3Key": "e995b7fa13f3d9f946ff291512015444c90346ee68f0067f80037541a4b54d62.zip"
},
"Description": "/opt/kubectl/kubectl 1.30; /opt/helm/helm 3.17.1",
"Description": "/opt/kubectl/kubectl 1.33.0; /opt/helm/helm 3.18.0",
"LicenseInfo": "Apache-2.0"
}
},
Expand Down Expand Up @@ -290,7 +290,7 @@
]
},
"Config": {
"version": "1.30",
"version": "1.33",
"roleArn": {
"Fn::GetAtt": [
"FargateClusterRole8E36B33A",
Expand Down
2 changes: 1 addition & 1 deletion ...cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.js.snapshot/tree.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.fargate-cluster.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class EksFargateClusterStack extends Stack {
this.node.setContext(EC2_RESTRICT_DEFAULT_SECURITY_GROUP, false);
this.vpc = props?.vpc ?? this.createDummyVpc();
new eks.FargateCluster(this, 'FargateCluster', {
...getClusterVersionConfig(this, eks.KubernetesVersion.V1_30),
...getClusterVersionConfig(this, eks.KubernetesVersion.V1_33),
prune: false,
authenticationMode: props?.authMode,
vpc: this.vpc,
Expand Down Expand Up @@ -50,5 +50,3 @@ new integ.IntegTest(app, 'aws-cdk-eks-fargate-cluster', {
// Test includes assets that are updated weekly. If not disabled, the upgrade PR will fail.
diffAssets: false,
});

app.synth();
Loading
Loading