Skip to content

Commit c48d46b

Browse files
committed
fix(eks): missing attribute support for AL2023 nodegroups creation
1 parent f63656e commit c48d46b

30 files changed

+7415
-16
lines changed

packages/@aws-cdk-testing/framework-integ/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"dependencies": {
4141
"@aws-cdk/integ-tests-alpha": "0.0.0",
4242
"@aws-cdk/lambda-layer-kubectl-v24": "^2.0.242",
43+
"@aws-cdk/lambda-layer-kubectl-v29": "^2.0.0",
4344
"aws-cdk-lib": "0.0.0",
4445
"aws-sdk": "^2.1576.0",
4546
"aws-sdk-mock": "5.6.0",
Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
11
import * as lambda from 'aws-cdk-lib/aws-lambda';
22
import { KubectlV24Layer } from '@aws-cdk/lambda-layer-kubectl-v24';
3+
import { KubectlV29Layer } from '@aws-cdk/lambda-layer-kubectl-v29';
34
import { Construct } from 'constructs';
45
import * as eks from 'aws-cdk-lib/aws-eks';
56

6-
export function getClusterVersionConfig(scope: Construct) {
7+
const versionMap: { [key: string]: any } = {
8+
1.24: KubectlV24Layer,
9+
1.29: KubectlV29Layer,
10+
};
11+
12+
export function getClusterVersionConfig(scope: Construct, version?: eks.KubernetesVersion) {
13+
const _version = version ?? eks.KubernetesVersion.V1_24;
714
return {
8-
version: eks.KubernetesVersion.V1_24,
15+
version: _version,
916
// Crazy type-casting is required because KubectlLayer peer depends on
1017
// types from aws-cdk-lib, but we run integration tests in the @aws-cdk/
1118
// v1-style directory, not in the aws-cdk-lib v2-style directory.
12-
kubectlLayer: new KubectlV24Layer(scope, 'KubectlLayer') as unknown as lambda.ILayerVersion,
19+
// kubectlLayer: new KubectlV24Layer(scope, 'KubectlLayer') as unknown as lambda.ILayerVersion,
20+
kubectlLayer: new versionMap[_version.version](scope, 'KubectlLayer') as unknown as lambda.ILayerVersion,
1321
};
1422
};

packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-al2023-nodegroup.js.snapshot/asset.1471fa6f2876749a13de79989efc6651c9768d3173ef5904947e87504f8d7069/apply/__init__.py

Lines changed: 95 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-al2023-nodegroup.js.snapshot/asset.1471fa6f2876749a13de79989efc6651c9768d3173ef5904947e87504f8d7069/get/__init__.py

Lines changed: 88 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)