From patchwork Tue Jan 14 20:03:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13939436 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 563941FF60E for ; Tue, 14 Jan 2025 20:03:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736885035; cv=none; b=CiTEA5+ZHvFCQPiWRlFaC6rfCXn7bS8a+9Ep1+R0hNzaexiyWrzArz2njaBwn0uRCTCshms6H2KvDl2US0PPrrMwJ5WaF4ASZvzC9N9CmU6TzUB9aQA1SCesj5Ey4kkxNmau3xDZPSm8gtqDamh1y42kcm9jxzEIsH3xphvYKvU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736885035; c=relaxed/simple; bh=umEReUlp/ectkanTsjl8KNicXTF2wCM8fwbpDSZicLs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rGfALLsTFPww8xwHKEuK8xywuZAndg4Bvz/cULDrPQy5pC4okHmo0R9CJiUlG5bp0j07GXfD4wk4v4OC3hMY1SCQkbOCaXZMFMJ8E8Lzzr8i2kcFiV/4XO1d6C6j54/Fdbw/I1H1ZAEtm28EZ50Iob4aAQYHGe4YLcGt/XkkZxc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gWPW1G4X; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gWPW1G4X" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B010FC4CEDD; Tue, 14 Jan 2025 20:03:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1736885035; bh=umEReUlp/ectkanTsjl8KNicXTF2wCM8fwbpDSZicLs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gWPW1G4XVkJ52ccN/LmVpCj+id68O7RQHsdN26ieSZaWgdQMsCSqbVzULTZibtV1U YwnXbBaVmbKeE+x1n7xAlYVa9fWA/32TDEqfz/okISd9PS6doNYiuHnyzDPqYYEOrL PheaDGaR3Up+2f41yFGZxBsIH5lV+NFYbWTBI3aImnfdz2NfLLoQXaYYObNg1Wu8El ZsxYXoJD8iifcYSss5/fLFUW4osL+GYfN5usqVzJGZYnLiW7MKN3Jonwsdn1sC1XFw gsUd9/alinVu+EWsstxojsi4BzNaZrsontVX6jK4byHb2ZSdPuMw7PtC0VfgAfuuGg cZUACzgZr9ikQ== From: cel@kernel.org To: Cc: Chuck Lever Subject: [PATCH v1 8/9] terraform/aws: Add support for m7a instance types Date: Tue, 14 Jan 2025 15:03:47 -0500 Message-ID: <20250114200348.1706018-9-cel@kernel.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250114200348.1706018-1-cel@kernel.org> References: <20250114200348.1706018-1-cel@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Chuck Lever These are less expensive AMD-based types, recommended by the AWS instance type advisor for CI/CD workloads. Signed-off-by: Chuck Lever --- terraform/aws/Kconfig | 66 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/terraform/aws/Kconfig b/terraform/aws/Kconfig index 42703ab2bec2..18e7713105ce 100644 --- a/terraform/aws/Kconfig +++ b/terraform/aws/Kconfig @@ -342,6 +342,66 @@ config TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE See https://aws.amazon.com/ec2/instance-types/m5/ for details. +config TERRAFORM_AWS_INSTANCE_M7A_MEDIUM + bool "m7a.medium" + depends on TARGET_ARCH_X86_64 + help + 4 GiB RAM, 1 AMD Ryzen vcpu, 1 10 GiB main drive, and up to + 12.5 Gbs network speed. + + Add storage by selecting the TERRAFORM_AWS_ENABLE_EBS_VOLUMES + option and adjusting the size and number of additional devices. + + See https://aws.amazon.com/ec2/instance-types/m7a/ for details. + +config TERRAFORM_AWS_INSTANCE_M7A_LARGE + bool "m7a.large" + depends on TARGET_ARCH_X86_64 + help + 8 GiB RAM, 2 AMD Ryzen vcpus, 1 10 GiB main drive, and up to + 12.5 Gbs network speed. + + Add storage by selecting the TERRAFORM_AWS_ENABLE_EBS_VOLUMES + option and adjusting the size and number of additional devices. + + See https://aws.amazon.com/ec2/instance-types/m7a/ for details. + +config TERRAFORM_AWS_INSTANCE_M7A_XLARGE + bool "m7a.xlarge" + depends on TARGET_ARCH_X86_64 + help + 16 GiB RAM, 4 AMD Ryzen vcpus, 1 10 GiB main drive, and up to + 12.5 Gbs network speed. + + Add storage by selecting the TERRAFORM_AWS_ENABLE_EBS_VOLUMES + option and adjusting the size and number of additional devices. + + See https://aws.amazon.com/ec2/instance-types/m7a/ for details. + +config TERRAFORM_AWS_INSTANCE_M7A_2XLARGE + bool "m7a.2xlarge" + depends on TARGET_ARCH_X86_64 + help + 32 GiB RAM, 8 AMD Ryzen vcpus, 1 10 GiB main drive, and up to + 12.5 Gbs network speed. + + Add storage by selecting the TERRAFORM_AWS_ENABLE_EBS_VOLUMES + option and adjusting the size and number of additional devices. + + See https://aws.amazon.com/ec2/instance-types/m7a/ for details. + +config TERRAFORM_AWS_INSTANCE_M7A_4XLARGE + bool "m7a.4xlarge" + depends on TARGET_ARCH_X86_64 + help + 64 GiB RAM, 16 AMD Ryzen vcpus, 1 10 GiB main drive, and up to + 12.5 Gbs network speed. + + Add storage by selecting the TERRAFORM_AWS_ENABLE_EBS_VOLUMES + option and adjusting the size and number of additional devices. + + See https://aws.amazon.com/ec2/instance-types/m7a/ for details. + config TERRAFORM_AWS_INSTANCE_IS4GEN_MEDIUM bool "is4gen.medium" depends on TARGET_ARCH_ARM64 @@ -414,6 +474,12 @@ config TERRAFORM_AWS_INSTANCE_TYPE default "m5ad.xlarge" if TERRAFORM_AWS_INSTANCE_M5AD_XLARGE default "m5ad.2xlarge" if TERRAFORM_AWS_INSTANCE_M5AD_2XLARGE default "m5ad.4xlarge" if TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE + default "m7a.medium" if TERRAFORM_AWS_INSTANCE_M7A_MEDIUM + default "m7a.large" if TERRAFORM_AWS_INSTANCE_M7A_LARGE + default "m7a.xlarge" if TERRAFORM_AWS_INSTANCE_M7A_XLARGE + default "m7a.xlarge" if TERRAFORM_AWS_INSTANCE_M7A_XLARGE + default "m7a.2xlarge" if TERRAFORM_AWS_INSTANCE_M7A_2XLARGE + default "m7a.4xlarge" if TERRAFORM_AWS_INSTANCE_M7A_4XLARGE default "is4gen.medium" if TERRAFORM_AWS_INSTANCE_IS4GEN_MEDIUM default "is4gen.8xlarge" if TERRAFORM_AWS_INSTANCE_IS4GEN_8XLARGE default "im4gn.4xlarge" if TERRAFORM_AWS_INSTANCE_IM4GN_4XLARGE