Skip to content

Commit 6a45601

Browse files
committed
terraform/aws: Add support for m7a instance types
These are less expensive AMD-based types, recommended by the AWS instance type advisor for CI/CD workloads. Reviewed-by: Luis Chamberlain <[email protected]> Signed-off-by: Chuck Lever <[email protected]>
1 parent 6dfd6bc commit 6a45601

File tree

1 file changed

+66
-0
lines changed

1 file changed

+66
-0
lines changed

terraform/aws/Kconfig

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,66 @@ config TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE
342342

343343
See https://aws.amazon.com/ec2/instance-types/m5/ for details.
344344

345+
config TERRAFORM_AWS_INSTANCE_M7A_MEDIUM
346+
bool "m7a.medium"
347+
depends on TARGET_ARCH_X86_64
348+
help
349+
4 GiB RAM, 1 AMD Ryzen vcpu, 1 10 GiB main drive, and up to
350+
12.5 Gbs network speed.
351+
352+
Add storage by selecting the TERRAFORM_AWS_ENABLE_EBS_VOLUMES
353+
option and adjusting the size and number of additional devices.
354+
355+
See https://aws.amazon.com/ec2/instance-types/m7a/ for details.
356+
357+
config TERRAFORM_AWS_INSTANCE_M7A_LARGE
358+
bool "m7a.large"
359+
depends on TARGET_ARCH_X86_64
360+
help
361+
8 GiB RAM, 2 AMD Ryzen vcpus, 1 10 GiB main drive, and up to
362+
12.5 Gbs network speed.
363+
364+
Add storage by selecting the TERRAFORM_AWS_ENABLE_EBS_VOLUMES
365+
option and adjusting the size and number of additional devices.
366+
367+
See https://aws.amazon.com/ec2/instance-types/m7a/ for details.
368+
369+
config TERRAFORM_AWS_INSTANCE_M7A_XLARGE
370+
bool "m7a.xlarge"
371+
depends on TARGET_ARCH_X86_64
372+
help
373+
16 GiB RAM, 4 AMD Ryzen vcpus, 1 10 GiB main drive, and up to
374+
12.5 Gbs network speed.
375+
376+
Add storage by selecting the TERRAFORM_AWS_ENABLE_EBS_VOLUMES
377+
option and adjusting the size and number of additional devices.
378+
379+
See https://aws.amazon.com/ec2/instance-types/m7a/ for details.
380+
381+
config TERRAFORM_AWS_INSTANCE_M7A_2XLARGE
382+
bool "m7a.2xlarge"
383+
depends on TARGET_ARCH_X86_64
384+
help
385+
32 GiB RAM, 8 AMD Ryzen vcpus, 1 10 GiB main drive, and up to
386+
12.5 Gbs network speed.
387+
388+
Add storage by selecting the TERRAFORM_AWS_ENABLE_EBS_VOLUMES
389+
option and adjusting the size and number of additional devices.
390+
391+
See https://aws.amazon.com/ec2/instance-types/m7a/ for details.
392+
393+
config TERRAFORM_AWS_INSTANCE_M7A_4XLARGE
394+
bool "m7a.4xlarge"
395+
depends on TARGET_ARCH_X86_64
396+
help
397+
64 GiB RAM, 16 AMD Ryzen vcpus, 1 10 GiB main drive, and up to
398+
12.5 Gbs network speed.
399+
400+
Add storage by selecting the TERRAFORM_AWS_ENABLE_EBS_VOLUMES
401+
option and adjusting the size and number of additional devices.
402+
403+
See https://aws.amazon.com/ec2/instance-types/m7a/ for details.
404+
345405
config TERRAFORM_AWS_INSTANCE_IS4GEN_MEDIUM
346406
bool "is4gen.medium"
347407
depends on TARGET_ARCH_ARM64
@@ -414,6 +474,12 @@ config TERRAFORM_AWS_INSTANCE_TYPE
414474
default "m5ad.xlarge" if TERRAFORM_AWS_INSTANCE_M5AD_XLARGE
415475
default "m5ad.2xlarge" if TERRAFORM_AWS_INSTANCE_M5AD_2XLARGE
416476
default "m5ad.4xlarge" if TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE
477+
default "m7a.medium" if TERRAFORM_AWS_INSTANCE_M7A_MEDIUM
478+
default "m7a.large" if TERRAFORM_AWS_INSTANCE_M7A_LARGE
479+
default "m7a.xlarge" if TERRAFORM_AWS_INSTANCE_M7A_XLARGE
480+
default "m7a.xlarge" if TERRAFORM_AWS_INSTANCE_M7A_XLARGE
481+
default "m7a.2xlarge" if TERRAFORM_AWS_INSTANCE_M7A_2XLARGE
482+
default "m7a.4xlarge" if TERRAFORM_AWS_INSTANCE_M7A_4XLARGE
417483
default "is4gen.medium" if TERRAFORM_AWS_INSTANCE_IS4GEN_MEDIUM
418484
default "is4gen.8xlarge" if TERRAFORM_AWS_INSTANCE_IS4GEN_8XLARGE
419485
default "im4gn.4xlarge" if TERRAFORM_AWS_INSTANCE_IM4GN_4XLARGE

0 commit comments

Comments
 (0)