From a72ec342b05a7e606cebe873a38d59471d7f525f Mon Sep 17 00:00:00 2001 From: Kevin Tao Date: Fri, 27 Oct 2023 16:54:18 -0500 Subject: [PATCH 1/4] add r7i option to ec2 instance types --- packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts index 4da2094aa8f63..e4fa2144f006a 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts @@ -326,6 +326,11 @@ export enum InstanceClass { */ R7GD = 'r7gd', + /** + * Memory optimized instances based on Intel Xeon Scalable (Sapphire Rapids) processors, 7th generation + */ + R7I = 'r7i', + /** * Memory optimized instances based on Intel Xeon Scalable (Sapphire Rapids) processors, 7th generation */ @@ -1251,6 +1256,7 @@ export class InstanceType { [InstanceClass.R7G]: 'r7g', [InstanceClass.MEMORY7_GRAVITON3_NVME_DRIVE]: 'r7gd', [InstanceClass.R7GD]: 'r7gd', + [InstanceClass.R7I]: 'r7i', [InstanceClass.MEMORY7_INTEL]: 'r7iz', [InstanceClass.R7IZ]: 'r7iz', [InstanceClass.COMPUTE3]: 'c3', From 29a9cbd10818b10f5d02a5b437a02869bfd62cd5 Mon Sep 17 00:00:00 2001 From: Kevin Tao Date: Mon, 6 Nov 2023 12:52:56 -0600 Subject: [PATCH 2/4] switch r7i to MEMORY7_INTEL_BASE --- packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts index eccd26605ba70..91acc956cb280 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts @@ -347,17 +347,22 @@ export enum InstanceClass { R7GD = 'r7gd', /** - * Memory optimized instances based on Intel Xeon Scalable (Sapphire Rapids) processors, 7th generation + * Memory optimized instances based on Intel Xeon Scalable (Sapphire Rapids) processors, 7th generation w/ 3.2GHz turbo frequency + */ + MEMORY7_INTEL_BASE = 'memory7-intel-base', + + /** + * Memory optimized instances based on Intel Xeon Scalable (Sapphire Rapids) processors, 7th generation w/ 3.2GHz turbo frequency */ R7I = 'r7i', /** - * Memory optimized instances based on Intel Xeon Scalable (Sapphire Rapids) processors, 7th generation + * Memory optimized instances based on Intel Xeon Scalable (Sapphire Rapids) processors, 7th generation w/ sustained 3.9GHz turbo frequency */ MEMORY7_INTEL = 'memory7-intel', /** - * Memory optimized instances based on Intel Xeon Scalable (Sapphire Rapids) processors, 7th generation + * Memory optimized instances based on Intel Xeon Scalable (Sapphire Rapids) processors, 7th generation w/ sustained 3.9GHz turbo frequency */ R7IZ = 'r7iz', @@ -1340,6 +1345,7 @@ export class InstanceType { [InstanceClass.R7G]: 'r7g', [InstanceClass.MEMORY7_GRAVITON3_NVME_DRIVE]: 'r7gd', [InstanceClass.R7GD]: 'r7gd', + [InstanceClass.MEMORY7_INTEL_BASE]: 'r7i', [InstanceClass.R7I]: 'r7i', [InstanceClass.MEMORY7_INTEL]: 'r7iz', [InstanceClass.R7IZ]: 'r7iz', From 38d94585542c2e156ffe19bc801b74429a713850 Mon Sep 17 00:00:00 2001 From: Parker Scanlon <69879391+scanlonp@users.noreply.github.com> Date: Thu, 9 Nov 2023 08:54:48 -0800 Subject: [PATCH 3/4] Update packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts --- packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts index 91acc956cb280..6d88767a568c9 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts @@ -362,7 +362,7 @@ export enum InstanceClass { MEMORY7_INTEL = 'memory7-intel', /** - * Memory optimized instances based on Intel Xeon Scalable (Sapphire Rapids) processors, 7th generation w/ sustained 3.9GHz turbo frequency + * Memory optimized instances based on Intel Xeon Scalable (Sapphire Rapids) processors, 7th generation, with sustained 3.9GHz turbo frequency */ R7IZ = 'r7iz', From 25906bb76bab3f44c2c35d833537eb49cf821864 Mon Sep 17 00:00:00 2001 From: Parker Scanlon <69879391+scanlonp@users.noreply.github.com> Date: Thu, 9 Nov 2023 08:57:09 -0800 Subject: [PATCH 4/4] Update packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts --- packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts index 6d88767a568c9..33e7bc63d3847 100644 --- a/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts +++ b/packages/aws-cdk-lib/aws-ec2/lib/instance-types.ts @@ -357,7 +357,7 @@ export enum InstanceClass { R7I = 'r7i', /** - * Memory optimized instances based on Intel Xeon Scalable (Sapphire Rapids) processors, 7th generation w/ sustained 3.9GHz turbo frequency + * Memory optimized instances based on Intel Xeon Scalable (Sapphire Rapids) processors, 7th generation, with sustained 3.9GHz turbo frequency */ MEMORY7_INTEL = 'memory7-intel',