diff --git a/scripts/generate_cloud_configs.py b/scripts/generate_cloud_configs.py index b16294dd7..ceb2eafc6 100755 --- a/scripts/generate_cloud_configs.py +++ b/scripts/generate_cloud_configs.py @@ -100,6 +100,52 @@ def get_lambdalabs_summary() -> tuple[bool, str]: return False, "Lambda Labs: Error querying API - using defaults" +def generate_aws_kconfig() -> bool: + """ + Generate AWS Kconfig files. + Returns True on success, False on failure. + """ + script_dir = os.path.dirname(os.path.abspath(__file__)) + project_root = os.path.dirname(script_dir) + aws_scripts_dir = os.path.join(project_root, "terraform", "aws", "scripts") + aws_kconfigs_dir = os.path.join(project_root, "terraform", "aws", "kconfigs") + + # Define the script-to-output mapping + scripts_to_run = [ + ("gen_kconfig_ami", "Kconfig.ami"), + ("gen_kconfig_instance", "Kconfig.instance"), + ("gen_kconfig_location", "Kconfig.location"), + ] + + all_success = True + + for script_name, kconfig_file in scripts_to_run: + script_path = os.path.join(aws_scripts_dir, script_name) + output_path = os.path.join(aws_kconfigs_dir, kconfig_file) + + # Run the script and capture its output + result = subprocess.run( + [script_path], + capture_output=True, + text=True, + check=False, + ) + + if result.returncode == 0: + # Write the output to the corresponding Kconfig file + try: + with open(output_path, 'w') as f: + f.write(result.stdout) + except IOError as e: + print(f"Error writing {kconfig_file}: {e}", file=sys.stderr) + all_success = False + else: + print(f"Error running {script_name}: {result.stderr}", file=sys.stderr) + all_success = False + + return all_success + + def main(): """Main function to generate cloud configurations.""" print("Cloud Provider Configuration Summary") @@ -121,8 +167,13 @@ def main(): print(f"⚠ {summary}") print() - # AWS (placeholder - not implemented) - print("⚠ AWS: Dynamic configuration not yet implemented") + # AWS - Generate Kconfig files + kconfig_generated = generate_aws_kconfig() + if kconfig_generated: + print("✓ AWS: Kconfig files generated successfully") + else: + print("⚠ AWS: Failed to generate Kconfig files - using defaults") + print() # Azure (placeholder - not implemented) print("⚠ Azure: Dynamic configuration not yet implemented") @@ -130,6 +181,9 @@ def main(): # GCE (placeholder - not implemented) print("⚠ GCE: Dynamic configuration not yet implemented") + # OCI (placeholder - not implemented) + print("⚠ OCI: Dynamic configuration not yet implemented") + print() print("Note: Dynamic configurations query real-time availability") print("Run 'make menuconfig' to configure your cloud provider") diff --git a/terraform/aws/kconfigs/Kconfig.ami b/terraform/aws/kconfigs/Kconfig.ami index a0021c555..83065541b 100644 --- a/terraform/aws/kconfigs/Kconfig.ami +++ b/terraform/aws/kconfigs/Kconfig.ami @@ -109,8 +109,8 @@ config TERRAFORM_AWS_AMI_OWNER config TERRAFORM_AWS_NS string output yaml - default "AlmaLinux OS *" if TERRAFORM_AWS_AMI_ALMALINUX_10 - default "AlmaLinux OS 8.*" if TERRAFORM_AWS_AMI_ALMALINUX_8 + default "AlmaLinux OS Kitten 10.202509*" if TERRAFORM_AWS_AMI_ALMALINUX_10 + default "AlmaLinux OS 8.10.202*" if TERRAFORM_AWS_AMI_ALMALINUX_8 default "almalinux9-x86_64-community-vmware-bundle" if TERRAFORM_AWS_AMI_ALMALINUX_9 endif # TERRAFORM_AWS_DISTRO_ALMALINUX @@ -139,7 +139,7 @@ config TERRAFORM_AWS_AMI_OWNER config TERRAFORM_AWS_NS string output yaml - default "amzn2-ami-*" if TERRAFORM_AWS_AMI_AMAZON_LINUX_2 + default "amzn2-ami-minimal-*" if TERRAFORM_AWS_AMI_AMAZON_LINUX_2 default "al2023-ami-*" if TERRAFORM_AWS_AMI_AMAZON_LINUX_2023 endif # TERRAFORM_AWS_DISTRO_AMAZON @@ -257,9 +257,9 @@ config TERRAFORM_AWS_NS default "fedora-coreos-39.20240*" if TERRAFORM_AWS_AMI_FEDORA_39 default "fedora-coreos-40.202410*" if TERRAFORM_AWS_AMI_FEDORA_40 default "fedora-coreos-41.20250*" if TERRAFORM_AWS_AMI_FEDORA_41 - default "fedora-coreos-42.202509*" if TERRAFORM_AWS_AMI_FEDORA_42 - default "fedora-coreos-43.20250917.1*" if TERRAFORM_AWS_AMI_FEDORA_43 - default "fedora-coreos-44.202509*" if TERRAFORM_AWS_AMI_FEDORA_44 + default "fedora-coreos-42.202510*" if TERRAFORM_AWS_AMI_FEDORA_42 + default "fedora-coreos-43.2025100*" if TERRAFORM_AWS_AMI_FEDORA_43 + default "fedora-coreos-44.2025100*" if TERRAFORM_AWS_AMI_FEDORA_44 endif # TERRAFORM_AWS_DISTRO_FEDORA @@ -322,9 +322,9 @@ config TERRAFORM_AWS_AMI_OWNER config TERRAFORM_AWS_NS string output yaml - default "RHEL-10.0.0_HVM*" if TERRAFORM_AWS_AMI_RHEL_10 + default "RHEL-10.0.0_HVM-20250*" if TERRAFORM_AWS_AMI_RHEL_10 default "RHEL-7.9_HVM-20240930-x86_64-0-Hourly2-GP3" if TERRAFORM_AWS_AMI_RHEL_7 - default "RHEL-8.10.0_HVM-20250*" if TERRAFORM_AWS_AMI_RHEL_8 + default "RHEL-8.10.0_HVM-2025*" if TERRAFORM_AWS_AMI_RHEL_8 default "RHEL-9.*" if TERRAFORM_AWS_AMI_RHEL_9 endif # TERRAFORM_AWS_DISTRO_REDHAT @@ -392,8 +392,8 @@ config TERRAFORM_AWS_AMI_OWNER config TERRAFORM_AWS_NS string output yaml - default "suse-sles-12-sp5-v20250*" if TERRAFORM_AWS_AMI_SUSE_LINUX_ENTERPRISE_12 - default "suse-sles-15-sp*" if TERRAFORM_AWS_AMI_SUSE_LINUX_ENTERPRISE_15 + default "suse-sles-12-sp5-v2025*" if TERRAFORM_AWS_AMI_SUSE_LINUX_ENTERPRISE_12 + default "suse-sles-15-sp7-*" if TERRAFORM_AWS_AMI_SUSE_LINUX_ENTERPRISE_15 default "suse-sle-micro-5-*" if TERRAFORM_AWS_AMI_SUSE_LINUX_ENTERPRISE_5 default "suse-sle-micro-6-*" if TERRAFORM_AWS_AMI_SUSE_LINUX_ENTERPRISE_6 @@ -428,6 +428,9 @@ config TERRAFORM_AWS_AMI_UBUNTU_24_10 config TERRAFORM_AWS_AMI_UBUNTU_25_04 bool "Ubuntu 25.04" +config TERRAFORM_AWS_AMI_UBUNTU_25_10 + bool "Ubuntu 25.10" + endchoice config TERRAFORM_AWS_AMI_OWNER @@ -445,5 +448,6 @@ config TERRAFORM_AWS_NS default "ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-a*" if TERRAFORM_AWS_AMI_UBUNTU_24_04_LTS default "ubuntu/images/hvm-ssd-gp3/ubuntu-oracular-24.10-a*" if TERRAFORM_AWS_AMI_UBUNTU_24_10 default "ubuntu/images/hvm-ssd-gp3/ubuntu-plucky-25.04-a*" if TERRAFORM_AWS_AMI_UBUNTU_25_04 + default "ubuntu/images/hvm-ssd-gp3/ubuntu-questing-25.10-a*" if TERRAFORM_AWS_AMI_UBUNTU_25_10 endif # TERRAFORM_AWS_DISTRO_CANONICAL diff --git a/terraform/aws/kconfigs/Kconfig.instance b/terraform/aws/kconfigs/Kconfig.instance index ea624ebc2..c4ec3dc0d 100644 --- a/terraform/aws/kconfigs/Kconfig.instance +++ b/terraform/aws/kconfigs/Kconfig.instance @@ -186,6 +186,20 @@ config TERRAFORM_AWS_INSTANCE_FAMILY_C8GN See https://aws.amazon.com/ec2/instance-types/c8gn/ for details. +config TERRAFORM_AWS_INSTANCE_FAMILY_C8I + bool "c8i" + depends on TARGET_ARCH_X86_64 + help + See https://aws.amazon.com/ec2/instance-types/c8i/ for + details. + +config TERRAFORM_AWS_INSTANCE_FAMILY_C8I_FLEX + bool "c8i-flex" + depends on TARGET_ARCH_X86_64 + help + See https://aws.amazon.com/ec2/instance-types/c8i-flex/ for + details. + config TERRAFORM_AWS_INSTANCE_FAMILY_D2 bool "d2" depends on TARGET_ARCH_X86_64 @@ -830,6 +844,13 @@ config TERRAFORM_AWS_INSTANCE_FAMILY_R8G See https://aws.amazon.com/ec2/instance-types/r8g/ for details. +config TERRAFORM_AWS_INSTANCE_FAMILY_R8GB + bool "r8gb" + depends on TARGET_ARCH_ARM64 + help + See https://aws.amazon.com/ec2/instance-types/r8gb/ for + details. + config TERRAFORM_AWS_INSTANCE_FAMILY_R8GD bool "r8gd" depends on TARGET_ARCH_ARM64 @@ -3510,6 +3531,222 @@ config TERRAFORM_AWS_INSTANCE_TYPE endif # TERRAFORM_AWS_INSTANCE_FAMILY_C8GN +if TERRAFORM_AWS_INSTANCE_FAMILY_C8I + +choice + prompt "Instance type" + default TERRAFORM_AWS_INSTANCE_SIZE_C8I_LARGE + help + Add storage by increasing the number of EBS volumes per + instance. + +config TERRAFORM_AWS_INSTANCE_SIZE_C8I_LARGE + bool "c8i.large" + depends on TARGET_ARCH_X86_64 + help + vCPU count: 2 + RAM: 4.0 GiB + Network speed: Up to 12.5 Gigabit + +config TERRAFORM_AWS_INSTANCE_SIZE_C8I_XLARGE + bool "c8i.xlarge" + depends on TARGET_ARCH_X86_64 + help + vCPU count: 4 + RAM: 8.0 GiB + Network speed: Up to 12.5 Gigabit + +config TERRAFORM_AWS_INSTANCE_SIZE_C8I_2XLARGE + bool "c8i.2xlarge" + depends on TARGET_ARCH_X86_64 + help + vCPU count: 8 + RAM: 16.0 GiB + Network speed: Up to 15 Gigabit + +config TERRAFORM_AWS_INSTANCE_SIZE_C8I_4XLARGE + bool "c8i.4xlarge" + depends on TARGET_ARCH_X86_64 + help + vCPU count: 16 + RAM: 32.0 GiB + Network speed: Up to 15 Gigabit + +config TERRAFORM_AWS_INSTANCE_SIZE_C8I_8XLARGE + bool "c8i.8xlarge" + depends on TARGET_ARCH_X86_64 + help + vCPU count: 32 + RAM: 64.0 GiB + Network speed: 15 Gigabit + +config TERRAFORM_AWS_INSTANCE_SIZE_C8I_12XLARGE + bool "c8i.12xlarge" + depends on TARGET_ARCH_X86_64 + help + vCPU count: 48 + RAM: 96.0 GiB + Network speed: 22.5 Gigabit + +config TERRAFORM_AWS_INSTANCE_SIZE_C8I_16XLARGE + bool "c8i.16xlarge" + depends on TARGET_ARCH_X86_64 + help + vCPU count: 64 + RAM: 128.0 GiB + Network speed: 30 Gigabit + +config TERRAFORM_AWS_INSTANCE_SIZE_C8I_24XLARGE + bool "c8i.24xlarge" + depends on TARGET_ARCH_X86_64 + help + vCPU count: 96 + RAM: 192.0 GiB + Network speed: 40 Gigabit + +config TERRAFORM_AWS_INSTANCE_SIZE_C8I_32XLARGE + bool "c8i.32xlarge" + depends on TARGET_ARCH_X86_64 + help + vCPU count: 128 + RAM: 256.0 GiB + Network speed: 50 Gigabit + +config TERRAFORM_AWS_INSTANCE_SIZE_C8I_48XLARGE + bool "c8i.48xlarge" + depends on TARGET_ARCH_X86_64 + help + vCPU count: 192 + RAM: 384.0 GiB + Network speed: 75 Gigabit + +config TERRAFORM_AWS_INSTANCE_SIZE_C8I_METAL_48XL + bool "c8i.metal-48xl" + depends on TARGET_ARCH_X86_64 + help + vCPU count: 192 + RAM: 384.0 GiB + Network speed: 75 Gigabit + Bare metal instance. + +config TERRAFORM_AWS_INSTANCE_SIZE_C8I_96XLARGE + bool "c8i.96xlarge" + depends on TARGET_ARCH_X86_64 + help + vCPU count: 384 + RAM: 768.0 GiB + Network speed: 100 Gigabit + +config TERRAFORM_AWS_INSTANCE_SIZE_C8I_METAL_96XL + bool "c8i.metal-96xl" + depends on TARGET_ARCH_X86_64 + help + vCPU count: 384 + RAM: 768.0 GiB + Network speed: 100 Gigabit + Bare metal instance. + +endchoice + +config TERRAFORM_AWS_INSTANCE_TYPE + string + output yaml + default "c8i.large" if TERRAFORM_AWS_INSTANCE_SIZE_C8I_LARGE + default "c8i.xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_C8I_XLARGE + default "c8i.2xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_C8I_2XLARGE + default "c8i.4xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_C8I_4XLARGE + default "c8i.8xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_C8I_8XLARGE + default "c8i.12xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_C8I_12XLARGE + default "c8i.16xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_C8I_16XLARGE + default "c8i.24xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_C8I_24XLARGE + default "c8i.32xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_C8I_32XLARGE + default "c8i.48xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_C8I_48XLARGE + default "c8i.metal-48xl" if TERRAFORM_AWS_INSTANCE_SIZE_C8I_METAL_48XL + default "c8i.96xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_C8I_96XLARGE + default "c8i.metal-96xl" if TERRAFORM_AWS_INSTANCE_SIZE_C8I_METAL_96XL + +endif # TERRAFORM_AWS_INSTANCE_FAMILY_C8I + +if TERRAFORM_AWS_INSTANCE_FAMILY_C8I_FLEX + +choice + prompt "Instance type" + default TERRAFORM_AWS_INSTANCE_SIZE_C8I_FLEX_LARGE + help + Add storage by increasing the number of EBS volumes per + instance. + +config TERRAFORM_AWS_INSTANCE_SIZE_C8I_FLEX_LARGE + bool "c8i-flex.large" + depends on TARGET_ARCH_X86_64 + help + vCPU count: 2 + RAM: 4.0 GiB + Network speed: Up to 12.5 Gigabit + +config TERRAFORM_AWS_INSTANCE_SIZE_C8I_FLEX_XLARGE + bool "c8i-flex.xlarge" + depends on TARGET_ARCH_X86_64 + help + vCPU count: 4 + RAM: 8.0 GiB + Network speed: Up to 12.5 Gigabit + +config TERRAFORM_AWS_INSTANCE_SIZE_C8I_FLEX_2XLARGE + bool "c8i-flex.2xlarge" + depends on TARGET_ARCH_X86_64 + help + vCPU count: 8 + RAM: 16.0 GiB + Network speed: Up to 15 Gigabit + +config TERRAFORM_AWS_INSTANCE_SIZE_C8I_FLEX_4XLARGE + bool "c8i-flex.4xlarge" + depends on TARGET_ARCH_X86_64 + help + vCPU count: 16 + RAM: 32.0 GiB + Network speed: Up to 15 Gigabit + +config TERRAFORM_AWS_INSTANCE_SIZE_C8I_FLEX_8XLARGE + bool "c8i-flex.8xlarge" + depends on TARGET_ARCH_X86_64 + help + vCPU count: 32 + RAM: 64.0 GiB + Network speed: Up to 15 Gigabit + +config TERRAFORM_AWS_INSTANCE_SIZE_C8I_FLEX_12XLARGE + bool "c8i-flex.12xlarge" + depends on TARGET_ARCH_X86_64 + help + vCPU count: 48 + RAM: 96.0 GiB + Network speed: Up to 22.5 Gigabit + +config TERRAFORM_AWS_INSTANCE_SIZE_C8I_FLEX_16XLARGE + bool "c8i-flex.16xlarge" + depends on TARGET_ARCH_X86_64 + help + vCPU count: 64 + RAM: 128.0 GiB + Network speed: Up to 30 Gigabit + +endchoice + +config TERRAFORM_AWS_INSTANCE_TYPE + string + output yaml + default "c8i-flex.large" if TERRAFORM_AWS_INSTANCE_SIZE_C8I_FLEX_LARGE + default "c8i-flex.xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_C8I_FLEX_XLARGE + default "c8i-flex.2xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_C8I_FLEX_2XLARGE + default "c8i-flex.4xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_C8I_FLEX_4XLARGE + default "c8i-flex.8xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_C8I_FLEX_8XLARGE + default "c8i-flex.12xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_C8I_FLEX_12XLARGE + default "c8i-flex.16xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_C8I_FLEX_16XLARGE + +endif # TERRAFORM_AWS_INSTANCE_FAMILY_C8I_FLEX + if TERRAFORM_AWS_INSTANCE_FAMILY_D2 choice @@ -5369,24 +5606,24 @@ config TERRAFORM_AWS_INSTANCE_SIZE_I8G_16XLARGE Network speed: Up to 37.5 Gigabit Additional storage: 15000 GB ssd -config TERRAFORM_AWS_INSTANCE_SIZE_I8G_METAL_24XL - bool "i8g.metal-24xl" +config TERRAFORM_AWS_INSTANCE_SIZE_I8G_24XLARGE + bool "i8g.24xlarge" depends on TARGET_ARCH_ARM64 help vCPU count: 96 RAM: 768.0 GiB Network speed: Up to 56.25 Gigabit Additional storage: 22500 GB ssd - Bare metal instance. -config TERRAFORM_AWS_INSTANCE_SIZE_I8G_24XLARGE - bool "i8g.24xlarge" +config TERRAFORM_AWS_INSTANCE_SIZE_I8G_METAL_24XL + bool "i8g.metal-24xl" depends on TARGET_ARCH_ARM64 help vCPU count: 96 RAM: 768.0 GiB Network speed: Up to 56.25 Gigabit Additional storage: 22500 GB ssd + Bare metal instance. config TERRAFORM_AWS_INSTANCE_SIZE_I8G_48XLARGE bool "i8g.48xlarge" @@ -5409,8 +5646,8 @@ config TERRAFORM_AWS_INSTANCE_TYPE default "i8g.8xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_I8G_8XLARGE default "i8g.12xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_I8G_12XLARGE default "i8g.16xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_I8G_16XLARGE - default "i8g.metal-24xl" if TERRAFORM_AWS_INSTANCE_SIZE_I8G_METAL_24XL default "i8g.24xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_I8G_24XLARGE + default "i8g.metal-24xl" if TERRAFORM_AWS_INSTANCE_SIZE_I8G_METAL_24XL default "i8g.48xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_I8G_48XLARGE endif # TERRAFORM_AWS_INSTANCE_FAMILY_I8G @@ -6685,22 +6922,22 @@ config TERRAFORM_AWS_INSTANCE_SIZE_M5ZN_6XLARGE RAM: 96.0 GiB Network speed: 50 Gigabit -config TERRAFORM_AWS_INSTANCE_SIZE_M5ZN_METAL - bool "m5zn.metal" +config TERRAFORM_AWS_INSTANCE_SIZE_M5ZN_12XLARGE + bool "m5zn.12xlarge" depends on TARGET_ARCH_X86_64 help vCPU count: 48 RAM: 192.0 GiB Network speed: 100 Gigabit - Bare metal instance. -config TERRAFORM_AWS_INSTANCE_SIZE_M5ZN_12XLARGE - bool "m5zn.12xlarge" +config TERRAFORM_AWS_INSTANCE_SIZE_M5ZN_METAL + bool "m5zn.metal" depends on TARGET_ARCH_X86_64 help vCPU count: 48 RAM: 192.0 GiB Network speed: 100 Gigabit + Bare metal instance. endchoice @@ -6712,8 +6949,8 @@ config TERRAFORM_AWS_INSTANCE_TYPE default "m5zn.2xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_M5ZN_2XLARGE default "m5zn.3xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_M5ZN_3XLARGE default "m5zn.6xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_M5ZN_6XLARGE - default "m5zn.metal" if TERRAFORM_AWS_INSTANCE_SIZE_M5ZN_METAL default "m5zn.12xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_M5ZN_12XLARGE + default "m5zn.metal" if TERRAFORM_AWS_INSTANCE_SIZE_M5ZN_METAL endif # TERRAFORM_AWS_INSTANCE_FAMILY_M5ZN @@ -11223,6 +11460,114 @@ config TERRAFORM_AWS_INSTANCE_TYPE endif # TERRAFORM_AWS_INSTANCE_FAMILY_R8G +if TERRAFORM_AWS_INSTANCE_FAMILY_R8GB + +choice + prompt "Instance type" + default TERRAFORM_AWS_INSTANCE_SIZE_R8GB_MEDIUM + help + Add storage by increasing the number of EBS volumes per + instance. + +config TERRAFORM_AWS_INSTANCE_SIZE_R8GB_MEDIUM + bool "r8gb.medium" + depends on TARGET_ARCH_ARM64 + help + vCPU count: 1 + RAM: 8.0 GiB + Network speed: Up to 16.66 Gigabit + +config TERRAFORM_AWS_INSTANCE_SIZE_R8GB_LARGE + bool "r8gb.large" + depends on TARGET_ARCH_ARM64 + help + vCPU count: 2 + RAM: 16.0 GiB + Network speed: Up to 20 Gigabit + +config TERRAFORM_AWS_INSTANCE_SIZE_R8GB_XLARGE + bool "r8gb.xlarge" + depends on TARGET_ARCH_ARM64 + help + vCPU count: 4 + RAM: 32.0 GiB + Network speed: Up to 26.66 Gigabit + +config TERRAFORM_AWS_INSTANCE_SIZE_R8GB_2XLARGE + bool "r8gb.2xlarge" + depends on TARGET_ARCH_ARM64 + help + vCPU count: 8 + RAM: 64.0 GiB + Network speed: Up to 33.33 Gigabit + +config TERRAFORM_AWS_INSTANCE_SIZE_R8GB_4XLARGE + bool "r8gb.4xlarge" + depends on TARGET_ARCH_ARM64 + help + vCPU count: 16 + RAM: 128.0 GiB + Network speed: 33.33 Gigabit + +config TERRAFORM_AWS_INSTANCE_SIZE_R8GB_8XLARGE + bool "r8gb.8xlarge" + depends on TARGET_ARCH_ARM64 + help + vCPU count: 32 + RAM: 256.0 GiB + Network speed: 66.66 Gigabit + +config TERRAFORM_AWS_INSTANCE_SIZE_R8GB_12XLARGE + bool "r8gb.12xlarge" + depends on TARGET_ARCH_ARM64 + help + vCPU count: 48 + RAM: 384.0 GiB + Network speed: 100 Gigabit + +config TERRAFORM_AWS_INSTANCE_SIZE_R8GB_16XLARGE + bool "r8gb.16xlarge" + depends on TARGET_ARCH_ARM64 + help + vCPU count: 64 + RAM: 512.0 GiB + Network speed: 133.33 Gigabit + +config TERRAFORM_AWS_INSTANCE_SIZE_R8GB_24XLARGE + bool "r8gb.24xlarge" + depends on TARGET_ARCH_ARM64 + help + vCPU count: 96 + RAM: 768.0 GiB + Network speed: 200 Gigabit + +config TERRAFORM_AWS_INSTANCE_SIZE_R8GB_METAL_24XL + bool "r8gb.metal-24xl" + depends on TARGET_ARCH_ARM64 + help + vCPU count: 96 + RAM: 768.0 GiB + Network speed: 200 Gigabit + Bare metal instance. + +endchoice + +config TERRAFORM_AWS_INSTANCE_TYPE + string + output yaml + default "r8gb.medium" if TERRAFORM_AWS_INSTANCE_SIZE_R8GB_MEDIUM + default "r8gb.large" if TERRAFORM_AWS_INSTANCE_SIZE_R8GB_LARGE + default "r8gb.xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_R8GB_XLARGE + default "r8gb.2xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_R8GB_2XLARGE + default "r8gb.4xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_R8GB_4XLARGE + default "r8gb.8xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_R8GB_8XLARGE + default "r8gb.12xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_R8GB_12XLARGE + default "r8gb.16xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_R8GB_16XLARGE + default "r8gb.24xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_R8GB_24XLARGE + default "r8gb.metal-24xl" if TERRAFORM_AWS_INSTANCE_SIZE_R8GB_METAL_24XL + +endif # TERRAFORM_AWS_INSTANCE_FAMILY_R8GB + if TERRAFORM_AWS_INSTANCE_FAMILY_R8GD choice @@ -11304,24 +11649,24 @@ config TERRAFORM_AWS_INSTANCE_SIZE_R8GD_16XLARGE Network speed: 30 Gigabit Additional storage: 3800 GB ssd -config TERRAFORM_AWS_INSTANCE_SIZE_R8GD_METAL_24XL - bool "r8gd.metal-24xl" +config TERRAFORM_AWS_INSTANCE_SIZE_R8GD_24XLARGE + bool "r8gd.24xlarge" depends on TARGET_ARCH_ARM64 help vCPU count: 96 RAM: 768.0 GiB Network speed: 40 Gigabit Additional storage: 5700 GB ssd - Bare metal instance. -config TERRAFORM_AWS_INSTANCE_SIZE_R8GD_24XLARGE - bool "r8gd.24xlarge" +config TERRAFORM_AWS_INSTANCE_SIZE_R8GD_METAL_24XL + bool "r8gd.metal-24xl" depends on TARGET_ARCH_ARM64 help vCPU count: 96 RAM: 768.0 GiB Network speed: 40 Gigabit Additional storage: 5700 GB ssd + Bare metal instance. config TERRAFORM_AWS_INSTANCE_SIZE_R8GD_METAL_48XL bool "r8gd.metal-48xl" @@ -11355,8 +11700,8 @@ config TERRAFORM_AWS_INSTANCE_TYPE default "r8gd.8xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_R8GD_8XLARGE default "r8gd.12xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_R8GD_12XLARGE default "r8gd.16xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_R8GD_16XLARGE - default "r8gd.metal-24xl" if TERRAFORM_AWS_INSTANCE_SIZE_R8GD_METAL_24XL default "r8gd.24xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_R8GD_24XLARGE + default "r8gd.metal-24xl" if TERRAFORM_AWS_INSTANCE_SIZE_R8GD_METAL_24XL default "r8gd.metal-48xl" if TERRAFORM_AWS_INSTANCE_SIZE_R8GD_METAL_48XL default "r8gd.48xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_R8GD_48XLARGE @@ -13008,24 +13353,24 @@ config TERRAFORM_AWS_INSTANCE_SIZE_Z1D_6XLARGE Network speed: 12 Gigabit Additional storage: 900 GB ssd -config TERRAFORM_AWS_INSTANCE_SIZE_Z1D_METAL - bool "z1d.metal" +config TERRAFORM_AWS_INSTANCE_SIZE_Z1D_12XLARGE + bool "z1d.12xlarge" depends on TARGET_ARCH_X86_64 help vCPU count: 48 RAM: 384.0 GiB Network speed: 25 Gigabit Additional storage: 1800 GB ssd - Bare metal instance. -config TERRAFORM_AWS_INSTANCE_SIZE_Z1D_12XLARGE - bool "z1d.12xlarge" +config TERRAFORM_AWS_INSTANCE_SIZE_Z1D_METAL + bool "z1d.metal" depends on TARGET_ARCH_X86_64 help vCPU count: 48 RAM: 384.0 GiB Network speed: 25 Gigabit Additional storage: 1800 GB ssd + Bare metal instance. endchoice @@ -13037,8 +13382,8 @@ config TERRAFORM_AWS_INSTANCE_TYPE default "z1d.2xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_Z1D_2XLARGE default "z1d.3xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_Z1D_3XLARGE default "z1d.6xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_Z1D_6XLARGE - default "z1d.metal" if TERRAFORM_AWS_INSTANCE_SIZE_Z1D_METAL default "z1d.12xlarge" if TERRAFORM_AWS_INSTANCE_SIZE_Z1D_12XLARGE + default "z1d.metal" if TERRAFORM_AWS_INSTANCE_SIZE_Z1D_METAL endif # TERRAFORM_AWS_INSTANCE_FAMILY_Z1D