Skip to content

Commit 70fd3e9

Browse files
robertdrobertd
authored
feat(eks): support for Kubernetes version 1.25 (#24484)
Depends on cdklabs/awscdk-asset-kubectl#174 Closes #24282 https://aws.amazon.com/blogs/containers/amazon-eks-now-supports-kubernetes-version-1-25/ <img width="1299" alt="image" src="https://user-images.githubusercontent.com/31543/223216858-bad3062d-e839-4ebe-bb09-fc08c1c94358.png"> <img width="1561" alt="image" src="https://user-images.githubusercontent.com/31543/223236176-0ecf38ca-3a89-40bc-a97d-0a8f29b26329.png"> ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 1487d9e commit 70fd3e9

19 files changed

+60
-47
lines changed

‎packages/@aws-cdk/aws-eks/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ This example defines an Amazon EKS cluster with the following configuration:
5050
```ts
5151
// provisiong a cluster
5252
const cluster = new eks.Cluster(this, 'hello-eks', {
53-
version: eks.KubernetesVersion.V1_24,
54-
kubectlLayer: new KubectlV24Layer(this, 'kubectl'),
53+
version: eks.KubernetesVersion.V1_25,
54+
kubectlLayer: new KubectlV25Layer(this, 'kubectl'),
5555
});
5656

5757
// apply a kubernetes manifest to the cluster
@@ -684,11 +684,11 @@ Only version 1.20 of kubectl is available in `aws-cdk-lib`. If you need a differ
684684
version, you will need to use one of the `@aws-cdk/lambda-layer-kubectl-vXY` packages.
685685

686686
```ts
687-
import { KubectlV24Layer } from '@aws-cdk/lambda-layer-kubectl-v24';
687+
import { KubectlV25Layer } from '@aws-cdk/lambda-layer-kubectl-v25';
688688

689689
const cluster = new eks.Cluster(this, 'hello-eks', {
690-
version: eks.KubernetesVersion.V1_24,
691-
kubectlLayer: new KubectlV24Layer(this, 'kubectl'),
690+
version: eks.KubernetesVersion.V1_25,
691+
kubectlLayer: new KubectlV25Layer(this, 'kubectl'),
692692
});
693693
```
694694

‎packages/@aws-cdk/aws-eks/lib/cluster.ts

+10
Original file line numberDiff line numberDiff line change
@@ -799,6 +799,7 @@ export interface ClusterProps extends ClusterOptions {
799799

800800
/**
801801
* Kubernetes cluster version
802+
* @see https://docs.aws.amazon.com/eks/latest/userguide/kubernetes-versions.html#kubernetes-release-calendar
802803
*/
803804
export class KubernetesVersion {
804805
/**
@@ -875,6 +876,15 @@ export class KubernetesVersion {
875876
*/
876877
public static readonly V1_24 = KubernetesVersion.of('1.24');
877878

879+
/**
880+
* Kubernetes version 1.25
881+
*
882+
* When creating a `Cluster` with this version, you need to also specify the
883+
* `kubectlLayer` property with a `KubectlV25Layer` from
884+
* `@aws-cdk/lambda-layer-kubectl-v25`.
885+
*/
886+
public static readonly V1_25 = KubernetesVersion.of('1.25');
887+
878888
/**
879889
* Custom cluster version
880890
* @param version custom version number

‎packages/@aws-cdk/aws-eks/test/cluster.test.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { BottleRocketImage } from '../lib/private/bottlerocket';
1818

1919
/* eslint-disable max-len */
2020

21-
const CLUSTER_VERSION = eks.KubernetesVersion.V1_21;
21+
const CLUSTER_VERSION = eks.KubernetesVersion.V1_25;
2222

2323
describe('cluster', () => {
2424
test('can configure and access ALB controller', () => {
@@ -656,7 +656,7 @@ describe('cluster', () => {
656656
Template.fromStack(stack).hasResourceProperties('Custom::AWSCDK-EKS-Cluster', {
657657
Config: {
658658
roleArn: { 'Fn::GetAtt': ['ClusterRoleFA261979', 'Arn'] },
659-
version: '1.21',
659+
version: CLUSTER_VERSION.version,
660660
resourcesVpcConfig: {
661661
securityGroupIds: [{ 'Fn::GetAtt': ['ClusterControlPlaneSecurityGroupD274242C', 'GroupId'] }],
662662
subnetIds: [
@@ -1589,7 +1589,7 @@ describe('cluster', () => {
15891589
const { app, stack } = testFixtureNoVpc();
15901590

15911591
// WHEN
1592-
new eks.EksOptimizedImage({ kubernetesVersion: '1.21' }).getImage(stack);
1592+
new eks.EksOptimizedImage({ kubernetesVersion: CLUSTER_VERSION.version }).getImage(stack);
15931593

15941594
// THEN
15951595
const assembly = app.synth();
@@ -1600,7 +1600,7 @@ describe('cluster', () => {
16001600
)).toEqual(true);
16011601
expect(Object.entries(parameters).some(
16021602
([k, v]) => k.startsWith('SsmParameterValueawsserviceeksoptimizedami') &&
1603-
(v as any).Default.includes('/1.21/'),
1603+
(v as any).Default.includes('/1.25/'),
16041604
)).toEqual(true);
16051605
});
16061606

@@ -1773,7 +1773,7 @@ describe('cluster', () => {
17731773
const { app, stack } = testFixtureNoVpc();
17741774

17751775
// WHEN
1776-
new BottleRocketImage({ kubernetesVersion: '1.21' }).getImage(stack);
1776+
new BottleRocketImage({ kubernetesVersion: CLUSTER_VERSION.version }).getImage(stack);
17771777

17781778
// THEN
17791779
const assembly = app.synth();
@@ -1784,7 +1784,7 @@ describe('cluster', () => {
17841784
)).toEqual(true);
17851785
expect(Object.entries(parameters).some(
17861786
([k, v]) => k.startsWith('SsmParameterValueawsservicebottlerocketaws') &&
1787-
(v as any).Default.includes('/aws-k8s-1.21/'),
1787+
(v as any).Default.includes('/aws-k8s-1.25/'),
17881788
)).toEqual(true);
17891789
});
17901790

@@ -1804,7 +1804,7 @@ describe('cluster', () => {
18041804
Config: {
18051805
name: 'my-cluster-name',
18061806
roleArn: { 'Fn::GetAtt': ['MyClusterRoleBA20FE72', 'Arn'] },
1807-
version: '1.21',
1807+
version: CLUSTER_VERSION.version,
18081808
resourcesVpcConfig: {
18091809
securityGroupIds: [
18101810
{ 'Fn::GetAtt': ['MyClusterControlPlaneSecurityGroup6B658F79', 'GroupId'] },

‎packages/@aws-cdk/aws-eks/test/fargate.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as kms from '@aws-cdk/aws-kms';
55
import { Stack, Tags } from '@aws-cdk/core';
66
import * as eks from '../lib';
77

8-
const CLUSTER_VERSION = eks.KubernetesVersion.V1_21;
8+
const CLUSTER_VERSION = eks.KubernetesVersion.V1_25;
99

1010
describe('fargate', () => {
1111
test('can be added to a cluster', () => {

‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.c17e6c5822dd39738b3ba669bef4bb7c8fceaea76b51477bf94d6745d0c201c8/apply/__init__.py renamed to ‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.92ea03f8b2e779503519f7781d06c03f95b46863db85f5c50a4e7debfd04be02/apply/__init__.py

File renamed without changes.

‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.c17e6c5822dd39738b3ba669bef4bb7c8fceaea76b51477bf94d6745d0c201c8/get/__init__.py renamed to ‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.92ea03f8b2e779503519f7781d06c03f95b46863db85f5c50a4e7debfd04be02/get/__init__.py

File renamed without changes.

‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.c17e6c5822dd39738b3ba669bef4bb7c8fceaea76b51477bf94d6745d0c201c8/helm/__init__.py renamed to ‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.92ea03f8b2e779503519f7781d06c03f95b46863db85f5c50a4e7debfd04be02/helm/__init__.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ def helm_handler(event, context):
4646
create_namespace = props.get('CreateNamespace', None)
4747
repository = props.get('Repository', None)
4848
values_text = props.get('Values', None)
49+
skip_crds = props.get('SkipCrds', False)
4950

5051
# "log in" to the cluster
5152
subprocess.check_call([ 'aws', 'eks', 'update-kubeconfig',
@@ -146,7 +147,7 @@ def get_chart_from_oci(tmpdir, repository = None, version = None):
146147
raise Exception(f'Operation failed after {maxAttempts} attempts: {output}')
147148

148149

149-
def helm(verb, release, chart = None, repo = None, file = None, namespace = None, version = None, wait = False, timeout = None, create_namespace = None):
150+
def helm(verb, release, chart = None, repo = None, file = None, namespace = None, version = None, wait = False, timeout = None, create_namespace = None, skip_crds = False):
150151
import subprocess
151152

152153
cmnd = ['helm', verb, release]
@@ -166,6 +167,8 @@ def helm(verb, release, chart = None, repo = None, file = None, namespace = None
166167
cmnd.extend(['--namespace', namespace])
167168
if wait:
168169
cmnd.append('--wait')
170+
if skip_crds:
171+
cmnd.append('--skip-crds')
169172
if not timeout is None:
170173
cmnd.extend(['--timeout', timeout])
171174
cmnd.extend(['--kubeconfig', kubeconfig])

‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.c17e6c5822dd39738b3ba669bef4bb7c8fceaea76b51477bf94d6745d0c201c8/index.py renamed to ‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.92ea03f8b2e779503519f7781d06c03f95b46863db85f5c50a4e7debfd04be02/index.py

File renamed without changes.

‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.c17e6c5822dd39738b3ba669bef4bb7c8fceaea76b51477bf94d6745d0c201c8/patch/__init__.py renamed to ‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.92ea03f8b2e779503519f7781d06c03f95b46863db85f5c50a4e7debfd04be02/patch/__init__.py

File renamed without changes.

‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.ad44c2b0638f04871c889d78e71dea90ffae67b9cc4aa4366d5102db42435ee1.zip

0 Bytes
Binary file not shown.

‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.c475180f5b1bbabac165414da13a9b843b111cd3b6d5fae9c954c006640c4064.zip

0 Bytes
Binary file not shown.

‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/asset.c9455aefa243f3cd7a810b3f6df8ed37e457d3e1d046353da27c4aa13551d4dc.zip

-861 Bytes
Binary file not shown.

‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/aws-cdk-eks-cluster-test.assets.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@
5757
}
5858
}
5959
},
60-
"c17e6c5822dd39738b3ba669bef4bb7c8fceaea76b51477bf94d6745d0c201c8": {
60+
"92ea03f8b2e779503519f7781d06c03f95b46863db85f5c50a4e7debfd04be02": {
6161
"source": {
62-
"path": "asset.c17e6c5822dd39738b3ba669bef4bb7c8fceaea76b51477bf94d6745d0c201c8",
62+
"path": "asset.92ea03f8b2e779503519f7781d06c03f95b46863db85f5c50a4e7debfd04be02",
6363
"packaging": "zip"
6464
},
6565
"destinations": {
6666
"current_account-us-east-1": {
6767
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1",
68-
"objectKey": "c17e6c5822dd39738b3ba669bef4bb7c8fceaea76b51477bf94d6745d0c201c8.zip",
68+
"objectKey": "92ea03f8b2e779503519f7781d06c03f95b46863db85f5c50a4e7debfd04be02.zip",
6969
"region": "us-east-1",
7070
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-us-east-1"
7171
}
@@ -141,29 +141,29 @@
141141
}
142142
}
143143
},
144-
"67a3aa529ec1ed1816a4cf80820b64e8664fc647e3c49f45996ed25b332e7d07": {
144+
"82bc7202ab93521f556ffe91199b3e2d55a9b03ae8334a40d6a5dd07ed7cbaeb": {
145145
"source": {
146146
"path": "awscdkeksclustertestawscdkawseksKubectlProviderE05943BF.nested.template.json",
147147
"packaging": "file"
148148
},
149149
"destinations": {
150150
"current_account-us-east-1": {
151151
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1",
152-
"objectKey": "67a3aa529ec1ed1816a4cf80820b64e8664fc647e3c49f45996ed25b332e7d07.json",
152+
"objectKey": "82bc7202ab93521f556ffe91199b3e2d55a9b03ae8334a40d6a5dd07ed7cbaeb.json",
153153
"region": "us-east-1",
154154
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-us-east-1"
155155
}
156156
}
157157
},
158-
"6782a2a042fa36c961aad9bb00a06c22bfc03046118bf097208ad738af93cbe7": {
158+
"fa91c42247dc7e7ad1ecea9e8017595a5e51a6892c8585202a74b115bd521a16": {
159159
"source": {
160160
"path": "aws-cdk-eks-cluster-test.template.json",
161161
"packaging": "file"
162162
},
163163
"destinations": {
164164
"current_account-us-east-1": {
165165
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1",
166-
"objectKey": "6782a2a042fa36c961aad9bb00a06c22bfc03046118bf097208ad738af93cbe7.json",
166+
"objectKey": "fa91c42247dc7e7ad1ecea9e8017595a5e51a6892c8585202a74b115bd521a16.json",
167167
"region": "us-east-1",
168168
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-us-east-1"
169169
}

‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/aws-cdk-eks-cluster-test.template.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -3406,7 +3406,7 @@
34063406
{
34073407
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1"
34083408
},
3409-
"/67a3aa529ec1ed1816a4cf80820b64e8664fc647e3c49f45996ed25b332e7d07.json"
3409+
"/82bc7202ab93521f556ffe91199b3e2d55a9b03ae8334a40d6a5dd07ed7cbaeb.json"
34103410
]
34113411
]
34123412
},
@@ -3454,7 +3454,7 @@
34543454
"Properties": {
34553455
"LaunchTemplateData": {
34563456
"ImageId": {
3457-
"Ref": "SsmParameterValueawsserviceeksoptimizedami121amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
3457+
"Ref": "SsmParameterValueawsserviceeksoptimizedami125amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
34583458
},
34593459
"InstanceType": "t3.small",
34603460
"UserData": {
@@ -3715,9 +3715,9 @@
37153715
"Type": "AWS::SSM::Parameter::Value<String>",
37163716
"Default": "/aws/service/bottlerocket/aws-k8s-1.24/x86_64/latest/image_id"
37173717
},
3718-
"SsmParameterValueawsserviceeksoptimizedami121amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": {
3718+
"SsmParameterValueawsserviceeksoptimizedami125amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": {
37193719
"Type": "AWS::SSM::Parameter::Value<String>",
3720-
"Default": "/aws/service/eks/optimized-ami/1.21/amazon-linux-2/recommended/image_id"
3720+
"Default": "/aws/service/eks/optimized-ami/1.25/amazon-linux-2/recommended/image_id"
37213721
},
37223722
"BootstrapVersion": {
37233723
"Type": "AWS::SSM::Parameter::Value<String>",

‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/awscdkeksclustertestawscdkawseksKubectlProviderE05943BF.nested.template.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
"S3Bucket": {
138138
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1"
139139
},
140-
"S3Key": "c17e6c5822dd39738b3ba669bef4bb7c8fceaea76b51477bf94d6745d0c201c8.zip"
140+
"S3Key": "92ea03f8b2e779503519f7781d06c03f95b46863db85f5c50a4e7debfd04be02.zip"
141141
},
142142
"Role": {
143143
"Fn::GetAtt": [

‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/manifest.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"validateOnSynth": false,
1818
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-us-east-1",
1919
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-us-east-1",
20-
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1/6782a2a042fa36c961aad9bb00a06c22bfc03046118bf097208ad738af93cbe7.json",
20+
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1/fa91c42247dc7e7ad1ecea9e8017595a5e51a6892c8585202a74b115bd521a16.json",
2121
"requiresBootstrapStackVersion": 6,
2222
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
2323
"additionalDependencies": [
@@ -945,10 +945,10 @@
945945
"data": "SsmParameterValueawsservicebottlerocketawsk8s124x8664latestimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
946946
}
947947
],
948-
"/aws-cdk-eks-cluster-test/SsmParameterValue:--aws--service--eks--optimized-ami--1.21--amazon-linux-2--recommended--image_id:C96584B6-F00A-464E-AD19-53AFF4B05118.Parameter": [
948+
"/aws-cdk-eks-cluster-test/SsmParameterValue:--aws--service--eks--optimized-ami--1.25--amazon-linux-2--recommended--image_id:C96584B6-F00A-464E-AD19-53AFF4B05118.Parameter": [
949949
{
950950
"type": "aws:cdk:logicalId",
951-
"data": "SsmParameterValueawsserviceeksoptimizedami121amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
951+
"data": "SsmParameterValueawsserviceeksoptimizedami125amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
952952
}
953953
],
954954
"/aws-cdk-eks-cluster-test/LaunchTemplate": [

‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster.js.snapshot/tree.json

+16-16
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@
798798
},
799799
"constructInfo": {
800800
"fqn": "@aws-cdk/lambda-layer-kubectl-v24.KubectlV24Layer",
801-
"version": "2.0.108"
801+
"version": "2.0.113"
802802
}
803803
},
804804
"Cluster": {
@@ -1197,7 +1197,7 @@
11971197
},
11981198
"constructInfo": {
11991199
"fqn": "constructs.Construct",
1200-
"version": "10.1.259"
1200+
"version": "10.1.264"
12011201
}
12021202
},
12031203
"KubectlReadyBarrier": {
@@ -5557,7 +5557,7 @@
55575557
},
55585558
"constructInfo": {
55595559
"fqn": "constructs.Construct",
5560-
"version": "10.1.259"
5560+
"version": "10.1.264"
55615561
}
55625562
}
55635563
},
@@ -5632,7 +5632,7 @@
56325632
},
56335633
"constructInfo": {
56345634
"fqn": "constructs.Construct",
5635-
"version": "10.1.259"
5635+
"version": "10.1.264"
56365636
}
56375637
},
56385638
"@aws-cdk--aws-eks.KubectlProvider": {
@@ -5853,7 +5853,7 @@
58535853
"s3Bucket": {
58545854
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1"
58555855
},
5856-
"s3Key": "c17e6c5822dd39738b3ba669bef4bb7c8fceaea76b51477bf94d6745d0c201c8.zip"
5856+
"s3Key": "92ea03f8b2e779503519f7781d06c03f95b46863db85f5c50a4e7debfd04be02.zip"
58575857
},
58585858
"role": {
58595859
"Fn::GetAtt": [
@@ -6271,7 +6271,7 @@
62716271
{
62726272
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1"
62736273
},
6274-
"/67a3aa529ec1ed1816a4cf80820b64e8664fc647e3c49f45996ed25b332e7d07.json"
6274+
"/82bc7202ab93521f556ffe91199b3e2d55a9b03ae8334a40d6a5dd07ed7cbaeb.json"
62756275
]
62766276
]
62776277
},
@@ -6314,7 +6314,7 @@
63146314
},
63156315
"constructInfo": {
63166316
"fqn": "constructs.Construct",
6317-
"version": "10.1.259"
6317+
"version": "10.1.264"
63186318
}
63196319
},
63206320
"SsmParameterValue:--aws--service--eks--optimized-ami--1.24--amazon-linux-2--recommended--image_id:C96584B6-F00A-464E-AD19-53AFF4B05118.Parameter": {
@@ -6365,17 +6365,17 @@
63656365
"version": "0.0.0"
63666366
}
63676367
},
6368-
"SsmParameterValue:--aws--service--eks--optimized-ami--1.21--amazon-linux-2--recommended--image_id:C96584B6-F00A-464E-AD19-53AFF4B05118.Parameter": {
6369-
"id": "SsmParameterValue:--aws--service--eks--optimized-ami--1.21--amazon-linux-2--recommended--image_id:C96584B6-F00A-464E-AD19-53AFF4B05118.Parameter",
6370-
"path": "aws-cdk-eks-cluster-test/SsmParameterValue:--aws--service--eks--optimized-ami--1.21--amazon-linux-2--recommended--image_id:C96584B6-F00A-464E-AD19-53AFF4B05118.Parameter",
6368+
"SsmParameterValue:--aws--service--eks--optimized-ami--1.25--amazon-linux-2--recommended--image_id:C96584B6-F00A-464E-AD19-53AFF4B05118.Parameter": {
6369+
"id": "SsmParameterValue:--aws--service--eks--optimized-ami--1.25--amazon-linux-2--recommended--image_id:C96584B6-F00A-464E-AD19-53AFF4B05118.Parameter",
6370+
"path": "aws-cdk-eks-cluster-test/SsmParameterValue:--aws--service--eks--optimized-ami--1.25--amazon-linux-2--recommended--image_id:C96584B6-F00A-464E-AD19-53AFF4B05118.Parameter",
63716371
"constructInfo": {
63726372
"fqn": "@aws-cdk/core.CfnParameter",
63736373
"version": "0.0.0"
63746374
}
63756375
},
6376-
"SsmParameterValue:--aws--service--eks--optimized-ami--1.21--amazon-linux-2--recommended--image_id:C96584B6-F00A-464E-AD19-53AFF4B05118": {
6377-
"id": "SsmParameterValue:--aws--service--eks--optimized-ami--1.21--amazon-linux-2--recommended--image_id:C96584B6-F00A-464E-AD19-53AFF4B05118",
6378-
"path": "aws-cdk-eks-cluster-test/SsmParameterValue:--aws--service--eks--optimized-ami--1.21--amazon-linux-2--recommended--image_id:C96584B6-F00A-464E-AD19-53AFF4B05118",
6376+
"SsmParameterValue:--aws--service--eks--optimized-ami--1.25--amazon-linux-2--recommended--image_id:C96584B6-F00A-464E-AD19-53AFF4B05118": {
6377+
"id": "SsmParameterValue:--aws--service--eks--optimized-ami--1.25--amazon-linux-2--recommended--image_id:C96584B6-F00A-464E-AD19-53AFF4B05118",
6378+
"path": "aws-cdk-eks-cluster-test/SsmParameterValue:--aws--service--eks--optimized-ami--1.25--amazon-linux-2--recommended--image_id:C96584B6-F00A-464E-AD19-53AFF4B05118",
63796379
"constructInfo": {
63806380
"fqn": "@aws-cdk/core.Resource",
63816381
"version": "0.0.0"
@@ -6389,7 +6389,7 @@
63896389
"aws:cdk:cloudformation:props": {
63906390
"launchTemplateData": {
63916391
"imageId": {
6392-
"Ref": "SsmParameterValueawsserviceeksoptimizedami121amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
6392+
"Ref": "SsmParameterValueawsserviceeksoptimizedami125amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
63936393
},
63946394
"instanceType": "t3.small",
63956395
"userData": {
@@ -6618,7 +6618,7 @@
66186618
"path": "aws-cdk-eks-cluster/DefaultTest/Default",
66196619
"constructInfo": {
66206620
"fqn": "constructs.Construct",
6621-
"version": "10.1.259"
6621+
"version": "10.1.264"
66226622
}
66236623
},
66246624
"DeployAssert": {
@@ -6664,7 +6664,7 @@
66646664
"path": "Tree",
66656665
"constructInfo": {
66666666
"fqn": "constructs.Construct",
6667-
"version": "10.1.259"
6667+
"version": "10.1.264"
66686668
}
66696669
}
66706670
},

‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ class EksClusterStack extends Stack {
228228
const lt = new ec2.CfnLaunchTemplate(this, 'LaunchTemplate', {
229229
launchTemplateData: {
230230
imageId: new eks.EksOptimizedImage({
231-
kubernetesVersion: eks.KubernetesVersion.V1_21.version,
231+
kubernetesVersion: eks.KubernetesVersion.V1_25.version,
232232
}).getImage(this).imageId,
233233
instanceType: new ec2.InstanceType('t3.small').toString(),
234234
userData: Fn.base64(userData.render()),

‎packages/@aws-cdk/aws-eks/test/util.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as ec2 from '@aws-cdk/aws-ec2';
22
import { App, Stack } from '@aws-cdk/core';
33
import { Cluster, ClusterProps, KubernetesVersion } from '../lib';
44

5-
const CLUSTER_VERSION = KubernetesVersion.V1_16;
5+
const CLUSTER_VERSION = KubernetesVersion.V1_25;
66

77
export function testFixture() {
88
const { stack, app } = testFixtureNoVpc();

0 commit comments

Comments
 (0)