Skip to content

Commit f2f5dae

Browse files
authored
chore(ecs): add Windows2025 AMI (#34901)
### Issue # (if applicable) None ### Reason for this change https://aws.amazon.com/about-aws/whats-new/2025/07/aws-availability-ecs-optimized-windows-server-2025-amis/ ### Description of changes - Add Windows 2025 AMI - Integ update instance type + image since old ones no longer compatible <img width="676" alt="Screenshot 2025-07-03 205357" src="https://github.com/user-attachments/assets/f7cb6482-07d9-4061-83f7-82d8cabf955d" /> Error of old image on Windows2025 ```console CannotStartContainerError: Error response from daemon: container f21c7ecd0047ff6ab04059523979ab2c16f20efa2a40a8a68d718fa30131f40c encountered an error during hcs::System::Start: failure in a Windows system call: The container operating system does not match the host operating system. ``` ### Describe any new or updated permissions being added ### Description of how you validated changes Integ ### 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*
1 parent 3be43fd commit f2f5dae

File tree

9 files changed

+26
-27
lines changed

9 files changed

+26
-27
lines changed

packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/integ.cluster-windows-server-ami.js.snapshot/ClusterWindowsServerDefaultTestDeployAssertC6412DEB.assets.json

Lines changed: 1 addition & 1 deletion
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-ecs/test/integ.cluster-windows-server-ami.js.snapshot/cdk.out

Lines changed: 1 addition & 1 deletion
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-ecs/test/integ.cluster-windows-server-ami.js.snapshot/integ-ecs-windows-server-ami.assets.json

Lines changed: 3 additions & 3 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-ecs/test/integ.cluster-windows-server-ami.js.snapshot/integ-ecs-windows-server-ami.template.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -503,9 +503,9 @@
503503
}
504504
},
505505
"ImageId": {
506-
"Ref": "SsmParameterValueawsserviceamiwindowslatestWindowsServer2022EnglishFullECSOptimizedimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
506+
"Ref": "SsmParameterValueawsserviceamiwindowslatestWindowsServer2025EnglishFullECSOptimizedimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
507507
},
508-
"InstanceType": "t2.large",
508+
"InstanceType": "t3.small",
509509
"Monitoring": {
510510
"Enabled": false
511511
},
@@ -915,11 +915,10 @@
915915
"Properties": {
916916
"ContainerDefinitions": [
917917
{
918-
"Cpu": 1024,
919918
"Essential": true,
920-
"Image": "public.ecr.aws/aws-observability/aws-for-fluent-bit:windowsservercore-stable",
921-
"Memory": 2096,
922-
"Name": "fluent-bit"
919+
"Image": "hello-world",
920+
"Memory": 256,
921+
"Name": "main"
923922
}
924923
],
925924
"Family": "integecswindowsserveramiTaskDef7E874ECF",
@@ -1091,9 +1090,9 @@
10911090
}
10921091
},
10931092
"Parameters": {
1094-
"SsmParameterValueawsserviceamiwindowslatestWindowsServer2022EnglishFullECSOptimizedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": {
1093+
"SsmParameterValueawsserviceamiwindowslatestWindowsServer2025EnglishFullECSOptimizedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": {
10951094
"Type": "AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>",
1096-
"Default": "/aws/service/ami-windows-latest/Windows_Server-2022-English-Full-ECS_Optimized/image_id"
1095+
"Default": "/aws/service/ami-windows-latest/Windows_Server-2025-English-Full-ECS_Optimized/image_id"
10971096
},
10981097
"BootstrapVersion": {
10991098
"Type": "AWS::SSM::Parameter::Value<String>",

packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/integ.cluster-windows-server-ami.js.snapshot/integ.json

Lines changed: 2 additions & 2 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-ecs/test/integ.cluster-windows-server-ami.js.snapshot/manifest.json

Lines changed: 5 additions & 5 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-ecs/test/integ.cluster-windows-server-ami.js.snapshot/tree.json

Lines changed: 1 addition & 1 deletion
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-ecs/test/integ.cluster-windows-server-ami.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ insRole.applyRemovalPolicy(cdk.RemovalPolicy.DESTROY);
3232
const autoScalingGroup = new autoscaling.AutoScalingGroup(stack, 'ASG', {
3333
vpc,
3434
role: insRole,
35-
instanceType: ec2.InstanceType.of(ec2.InstanceClass.T2, ec2.InstanceSize.LARGE),
36-
machineImage: ecs.EcsOptimizedImage.windows(ecs.WindowsOptimizedVersion.SERVER_2022),
35+
instanceType: ec2.InstanceType.of(ec2.InstanceClass.T3, ec2.InstanceSize.SMALL),
36+
machineImage: ecs.EcsOptimizedImage.windows(ecs.WindowsOptimizedVersion.SERVER_2025),
3737
minCapacity: 1,
3838
});
3939

@@ -46,10 +46,9 @@ cluster.addAsgCapacityProvider(cp);
4646

4747
const taskDefinition = new ecs.Ec2TaskDefinition(stack, 'TaskDef', {});
4848

49-
taskDefinition.addContainer('fluent-bit', {
50-
image: ecs.ContainerImage.fromRegistry('public.ecr.aws/aws-observability/aws-for-fluent-bit:windowsservercore-stable'),
51-
memoryLimitMiB: 2096,
52-
cpu: 1024,
49+
taskDefinition.addContainer('main', {
50+
image: ecs.ContainerImage.fromRegistry('hello-world'),
51+
memoryLimitMiB: 256,
5352
});
5453

5554
new ecs.Ec2Service(stack, 'EC2Service', {

packages/aws-cdk-lib/aws-ecs/lib/amis.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ export enum AmiHardwareType {
3737
* ECS-optimized Windows version list
3838
*/
3939
export enum WindowsOptimizedVersion {
40+
SERVER_2025 = '2025',
4041
SERVER_2022 = '2022',
4142
SERVER_2019 = '2019',
4243
SERVER_2016 = '2016',

0 commit comments

Comments
 (0)