From: Chuck Lever <cel@kernel.org>
To: <kdevops@lists.linux.dev>
Cc: Chuck Lever <chuck.lever@oracle.com>
Subject: [PATCH v1 17/26] terraform/gce: Update existing machine types and introduce new ones
Date: Wed, 27 Aug 2025 10:28:12 -0400 [thread overview]
Message-ID: <20250827142832.2629291-18-cel@kernel.org> (raw)
In-Reply-To: <20250827142832.2629291-1-cel@kernel.org>
From: Chuck Lever <chuck.lever@oracle.com>
Add a spectrum of cost and performance choices.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
.../gce/kconfigs/machines/Kconfig.c3-standard | 41 +++++++++++++
.../kconfigs/machines/Kconfig.c3d-standard | 46 +++++++++++++++
.../gce/kconfigs/machines/Kconfig.c4-standard | 23 +++++---
.../kconfigs/machines/Kconfig.c4a-standard | 57 ++++++++++++++++++
.../kconfigs/machines/Kconfig.c4d-standard | 51 ++++++++++++++++
.../gce/kconfigs/machines/Kconfig.e2-highcpu | 58 +++++++++++++++++++
.../gce/kconfigs/machines/Kconfig.e2-standard | 58 +++++++++++++++++++
.../gce/kconfigs/machines/Kconfig.n1-highcpu | 55 ++++++++++++++++++
.../gce/kconfigs/machines/Kconfig.n1-standard | 26 +++++----
.../gce/kconfigs/machines/Kconfig.n2-highcpu | 16 +++--
.../gce/kconfigs/machines/Kconfig.n2-standard | 16 +++--
.../gce/kconfigs/machines/Kconfig.n2d-highcpu | 15 +++--
.../kconfigs/machines/Kconfig.n2d-standard | 17 +++---
.../gce/kconfigs/machines/Kconfig.n4-highcpu | 16 +++--
.../gce/kconfigs/machines/Kconfig.n4-standard | 16 +++--
15 files changed, 439 insertions(+), 72 deletions(-)
create mode 100644 terraform/gce/kconfigs/machines/Kconfig.c3-standard
create mode 100644 terraform/gce/kconfigs/machines/Kconfig.c3d-standard
create mode 100644 terraform/gce/kconfigs/machines/Kconfig.c4a-standard
create mode 100644 terraform/gce/kconfigs/machines/Kconfig.c4d-standard
create mode 100644 terraform/gce/kconfigs/machines/Kconfig.e2-highcpu
create mode 100644 terraform/gce/kconfigs/machines/Kconfig.e2-standard
create mode 100644 terraform/gce/kconfigs/machines/Kconfig.n1-highcpu
diff --git a/terraform/gce/kconfigs/machines/Kconfig.c3-standard b/terraform/gce/kconfigs/machines/Kconfig.c3-standard
new file mode 100644
index 000000000000..183ac315cabf
--- /dev/null
+++ b/terraform/gce/kconfigs/machines/Kconfig.c3-standard
@@ -0,0 +1,41 @@
+if TERRAFORM_GCE_MACHINE_FAMILY_C3_STANDARD
+
+choice
+ prompt "GCE Machine Type"
+ default TERRAFORM_GCE_MACHINE_C3_STANDARD_4
+ help
+ C3 VMs are powered by the 4th generation Intel Xeon
+ Scalable processors (code-named Sapphire Rapids), DDR5
+ memory, and Titanium, enabling higher levels of networking
+ performance, isolation and security.
+
+config TERRAFORM_GCE_MACHINE_C3_STANDARD_4
+ bool "c3-standard-4"
+ help
+ 4 vCPUs (2 cores) and 16GB of memory.
+
+config TERRAFORM_GCE_MACHINE_C3_STANDARD_8
+ bool "c3-standard-8"
+ help
+ 8 vCPUs (4 cores) and 32GB of memory.
+
+config TERRAFORM_GCE_MACHINE_C3_STANDARD_22
+ bool "c3-standard-22"
+ help
+ 22 vCPUs (11 cores) and 88GB of memory.
+
+endchoice
+
+config TERRAFORM_GCE_MACHINE_TYPE
+ string
+ output yaml
+ default "c3-standard-4" if TERRAFORM_GCE_MACHINE_C3_STANDARD_4
+ default "c3-standard-8" if TERRAFORM_GCE_MACHINE_C3_STANDARD_8
+ default "c3-standard-22" if TERRAFORM_GCE_MACHINE_C3_STANDARD_22
+
+config TERRAFORM_GCE_IMAGE_TYPE
+ string
+ output yaml
+ default "hyperdisk-balanced"
+
+endif # TERRAFORM_GCE_MACHINE_FAMILY_C3_STANDARD
diff --git a/terraform/gce/kconfigs/machines/Kconfig.c3d-standard b/terraform/gce/kconfigs/machines/Kconfig.c3d-standard
new file mode 100644
index 000000000000..4af821e5a14e
--- /dev/null
+++ b/terraform/gce/kconfigs/machines/Kconfig.c3d-standard
@@ -0,0 +1,46 @@
+if TERRAFORM_GCE_MACHINE_FAMILY_C3D_STANDARD
+
+choice
+ prompt "GCE Machine Type"
+ default TERRAFORM_GCE_MACHINE_C3D_STANDARD_4
+ help
+ C3D VMs are powered by the 4th-gen AMD EPYC (Genoa)
+ processor. C3D uses Titanium, enabling higher levels
+ of networking performance, isolation and security.
+
+config TERRAFORM_GCE_MACHINE_C3D_STANDARD_4
+ bool "c3d-standard-4"
+ help
+ 4 vCPUs (2 cores) and 16GB of memory.
+
+config TERRAFORM_GCE_MACHINE_C3D_STANDARD_8
+ bool "c3d-standard-8"
+ help
+ 8 vCPUs (4 cores) and 32GB of memory.
+
+config TERRAFORM_GCE_MACHINE_C3D_STANDARD_16
+ bool "c3d-standard-16"
+ help
+ 16 vCPUs (8 cores) and 64GB of memory.
+
+config TERRAFORM_GCE_MACHINE_C3D_STANDARD_30
+ bool "c3d-standard-30"
+ help
+ 30 vCPUs (15 cores) and 120GB of memory.
+
+endchoice
+
+config TERRAFORM_GCE_MACHINE_TYPE
+ string
+ output yaml
+ default "c3d-standard-4" if TERRAFORM_GCE_MACHINE_C3D_STANDARD_4
+ default "c3d-standard-8" if TERRAFORM_GCE_MACHINE_C3D_STANDARD_8
+ default "c3d-standard-16" if TERRAFORM_GCE_MACHINE_C3D_STANDARD_16
+ default "c3d-standard-30" if TERRAFORM_GCE_MACHINE_C3D_STANDARD_30
+
+config TERRAFORM_GCE_IMAGE_TYPE
+ string
+ output yaml
+ default "hyperdisk-balanced"
+
+endif # TERRAFORM_GCE_MACHINE_FAMILY_C3D_STANDARD
diff --git a/terraform/gce/kconfigs/machines/Kconfig.c4-standard b/terraform/gce/kconfigs/machines/Kconfig.c4-standard
index 75c2eed2d111..3ec7f4ec1620 100644
--- a/terraform/gce/kconfigs/machines/Kconfig.c4-standard
+++ b/terraform/gce/kconfigs/machines/Kconfig.c4-standard
@@ -4,35 +4,39 @@ choice
prompt "GCE Machine Type"
default TERRAFORM_GCE_MACHINE_C4_STANDARD_4
help
- This option sets the GCE machine type. For other machine
- types, refer to this page:
-
- https://cloud.google.com/compute/docs/machine-types
+ C4 VMs are powered by 6th generation (code-named Granite
+ Rapids) or 5th generation (code-named Emerald Rapids)
+ Intel Xeon Scalable processors and Titanium.
config TERRAFORM_GCE_MACHINE_C4_STANDARD_2
bool "c4-standard-2"
help
- 2 vCPU (1 core) and 7GB of memory.
+ 2 vCPUs (1 core) and 7GB of memory.
config TERRAFORM_GCE_MACHINE_C4_STANDARD_4
bool "c4-standard-4"
help
- 4 vCPU (2 core) and 15GB of memory.
+ 4 vCPUs (2 core) and 15GB of memory.
config TERRAFORM_GCE_MACHINE_C4_STANDARD_8
bool "c4-standard-8"
help
- 8 vCPU (4 cores) and 30GB of memory.
+ 8 vCPUs (4 cores) and 30GB of memory.
config TERRAFORM_GCE_MACHINE_C4_STANDARD_16
bool "c4-standard-16"
help
- 16 vCPU (8 cores) and 60GB of memory.
+ 16 vCPUs (8 cores) and 60GB of memory.
config TERRAFORM_GCE_MACHINE_C4_STANDARD_24
bool "c4-standard-24"
help
- 24 vCPU (12 cores) and 90GB of memory.
+ 24 vCPUs (12 cores) and 90GB of memory.
+
+config TERRAFORM_GCE_MACHINE_C4_STANDARD_32
+ bool "c4-standard-32"
+ help
+ 32 vCPUs (16 cores) and 120 of memory.
endchoice
@@ -44,6 +48,7 @@ config TERRAFORM_GCE_MACHINE_TYPE
default "c4-standard-8" if TERRAFORM_GCE_MACHINE_C4_STANDARD_8
default "c4-standard-16" if TERRAFORM_GCE_MACHINE_C4_STANDARD_16
default "c4-standard-24" if TERRAFORM_GCE_MACHINE_C4_STANDARD_24
+ default "c4-standard-32" if TERRAFORM_GCE_MACHINE_C4_STANDARD_32
config TERRAFORM_GCE_IMAGE_TYPE
string
diff --git a/terraform/gce/kconfigs/machines/Kconfig.c4a-standard b/terraform/gce/kconfigs/machines/Kconfig.c4a-standard
new file mode 100644
index 000000000000..3a486fe4a6c3
--- /dev/null
+++ b/terraform/gce/kconfigs/machines/Kconfig.c4a-standard
@@ -0,0 +1,57 @@
+if TERRAFORM_GCE_MACHINE_FAMILY_C4A_STANDARD
+
+choice
+ prompt "GCE Machine Type"
+ default TERRAFORM_GCE_MACHINE_C4A_STANDARD_4
+ help
+ C4A VMs are powered by Google's first Arm-based Axion™
+ processor, DDR5 memory, and local Titanium SSDs.
+
+config TERRAFORM_GCE_MACHINE_C4A_STANDARD_1
+ bool "c4a-standard-1"
+ help
+ 1 vCPU and 4GB of memory.
+
+config TERRAFORM_GCE_MACHINE_C4A_STANDARD_2
+ bool "c4a-standard-2"
+ help
+ 2 vCPUs and 8GB of memory.
+
+config TERRAFORM_GCE_MACHINE_C4A_STANDARD_4
+ bool "c4a-standard-4"
+ help
+ 4 vCPUs and 16GB of memory.
+
+config TERRAFORM_GCE_MACHINE_C4A_STANDARD_8
+ bool "c4a-standard-8"
+ help
+ 8 vCPUs and 32GB of memory.
+
+config TERRAFORM_GCE_MACHINE_C4A_STANDARD_16
+ bool "c4a-standard-16"
+ help
+ 16 vCPUs and 64GB of memory.
+
+config TERRAFORM_GCE_MACHINE_C4A_STANDARD_32
+ bool "c4a-standard-32"
+ help
+ 32 vCPUs and 128GB of memory.
+
+endchoice
+
+config TERRAFORM_GCE_MACHINE_TYPE
+ string
+ output yaml
+ default "c4a-standard-1" if TERRAFORM_GCE_MACHINE_C4A_STANDARD_1
+ default "c4a-standard-2" if TERRAFORM_GCE_MACHINE_C4A_STANDARD_2
+ default "c4a-standard-4" if TERRAFORM_GCE_MACHINE_C4A_STANDARD_4
+ default "c4a-standard-8" if TERRAFORM_GCE_MACHINE_C4A_STANDARD_8
+ default "c4a-standard-16" if TERRAFORM_GCE_MACHINE_C4A_STANDARD_16
+ default "c4a-standard-32" if TERRAFORM_GCE_MACHINE_C4A_STANDARD_32
+
+config TERRAFORM_GCE_IMAGE_TYPE
+ string
+ output yaml
+ default "hyperdisk-balanced"
+
+endif # TERRAFORM_GCE_MACHINE_FAMILY_C4A_STANDARD
diff --git a/terraform/gce/kconfigs/machines/Kconfig.c4d-standard b/terraform/gce/kconfigs/machines/Kconfig.c4d-standard
new file mode 100644
index 000000000000..6d7b4bb96c8b
--- /dev/null
+++ b/terraform/gce/kconfigs/machines/Kconfig.c4d-standard
@@ -0,0 +1,51 @@
+if TERRAFORM_GCE_MACHINE_FAMILY_C4D_STANDARD
+
+choice
+ prompt "GCE Machine Type"
+ default TERRAFORM_GCE_MACHINE_C4D_STANDARD_4
+ help
+ C4D VMs are powered by the fifth generation AMD EPYC Turin
+ processor and Titanium.
+
+config TERRAFORM_GCE_MACHINE_C4D_STANDARD_2
+ bool "c4d-standard-2"
+ help
+ 2 vCPUs (1 core) and 7GB of memory.
+
+config TERRAFORM_GCE_MACHINE_C4D_STANDARD_4
+ bool "c4d-standard-4"
+ help
+ 4 vCPUs (2 core) and 15GB of memory.
+
+config TERRAFORM_GCE_MACHINE_C4D_STANDARD_8
+ bool "c4d-standard-8"
+ help
+ 8 vCPUs (4 cores) and 31GB of memory.
+
+config TERRAFORM_GCE_MACHINE_C4D_STANDARD_16
+ bool "c4d-standard-16"
+ help
+ 16 vCPUs (8 cores) and 62GB of memory.
+
+config TERRAFORM_GCE_MACHINE_C4D_STANDARD_24
+ bool "c4d-standard-24"
+ help
+ 32 vCPUs (16 cores) and 124GB of memory.
+
+endchoice
+
+config TERRAFORM_GCE_MACHINE_TYPE
+ string
+ output yaml
+ default "c4d-standard-2" if TERRAFORM_GCE_MACHINE_C4D_STANDARD_2
+ default "c4d-standard-4" if TERRAFORM_GCE_MACHINE_C4D_STANDARD_4
+ default "c4d-standard-8" if TERRAFORM_GCE_MACHINE_C4D_STANDARD_8
+ default "c4d-standard-16" if TERRAFORM_GCE_MACHINE_C4D_STANDARD_16
+ default "c4d-standard-32" if TERRAFORM_GCE_MACHINE_C4D_STANDARD_32
+
+config TERRAFORM_GCE_IMAGE_TYPE
+ string
+ output yaml
+ default "hyperdisk-balanced"
+
+endif # TERRAFORM_GCE_MACHINE_FAMILY_C4D_STANDARD
diff --git a/terraform/gce/kconfigs/machines/Kconfig.e2-highcpu b/terraform/gce/kconfigs/machines/Kconfig.e2-highcpu
new file mode 100644
index 000000000000..eb401451b3c8
--- /dev/null
+++ b/terraform/gce/kconfigs/machines/Kconfig.e2-highcpu
@@ -0,0 +1,58 @@
+if TERRAFORM_GCE_MACHINE_FAMILY_E2_HIGHCPU
+
+choice
+ prompt "GCE Machine type"
+ default TERRAFORM_GCE_MACHINE_E2_HIGHCPU_8
+ help
+ The E2 machine series offers both Intel and AMD EPYC
+ processors, selected for you at the time of VM creation.
+ Machine types in this series are available in all regions
+ and zones and support a virtio memory balloon device.
+
+config TERRAFORM_GCE_MACHINE_E2_HIGHCPU_2
+ bool "e2-highcpu-2"
+ depends on TARGET_ARCH_X86_64
+ help
+ 2 vCPUs (1 core) and 2GB of memory.
+
+config TERRAFORM_GCE_MACHINE_E2_HIGHCPU_4
+ bool "e2-highcpu-4"
+ depends on TARGET_ARCH_X86_64
+ help
+ 4 vCPUs (2 cores) and 4GB of memory.
+
+config TERRAFORM_GCE_MACHINE_E2_HIGHCPU_8
+ bool "e2-highcpu-8"
+ depends on TARGET_ARCH_X86_64
+ help
+ 8 vCPUs (4 cores) and 8GB of memory.
+
+config TERRAFORM_GCE_MACHINE_E2_HIGHCPU_16
+ bool "e2-highcpu-16"
+ depends on TARGET_ARCH_X86_64
+ help
+ 16 vCPUs (8 cores) and 16GB of memory.
+
+config TERRAFORM_GCE_MACHINE_E2_HIGHCPU_32
+ bool "e2-highcpu-32"
+ depends on TARGET_ARCH_X86_64
+ help
+ 32 vCPUs (16 cores) and 32GB of memory.
+
+endchoice
+
+config TERRAFORM_GCE_MACHINE_TYPE
+ string
+ output yaml
+ default "e2-highcpu-2" if TERRAFORM_GCE_MACHINE_E2_HIGHCPU_2
+ default "e2-highcpu-4" if TERRAFORM_GCE_MACHINE_E2_HIGHCPU_4
+ default "e2-highcpu-8" if TERRAFORM_GCE_MACHINE_E2_HIGHCPU_8
+ default "e2-highcpu-16" if TERRAFORM_GCE_MACHINE_E2_HIGHCPU_16
+ default "e2-highcpu-32" if TERRAFORM_GCE_MACHINE_E2_HIGHCPU_32
+
+config TERRAFORM_GCE_IMAGE_TYPE
+ string
+ output yaml
+ default "pd-balanced"
+
+endif # TERRAFORM_GCE_MACHINE_FAMILY_E2_HIGHCPU
diff --git a/terraform/gce/kconfigs/machines/Kconfig.e2-standard b/terraform/gce/kconfigs/machines/Kconfig.e2-standard
new file mode 100644
index 000000000000..26180f841d5a
--- /dev/null
+++ b/terraform/gce/kconfigs/machines/Kconfig.e2-standard
@@ -0,0 +1,58 @@
+if TERRAFORM_GCE_MACHINE_FAMILY_E2_STANDARD
+
+choice
+ prompt "GCE Machine type"
+ default TERRAFORM_GCE_MACHINE_E2_STANDARD_8
+ help
+ The E2 machine series offers both Intel and AMD EPYC
+ processors, selected for you at the time of VM creation.
+ Machine types in this series are available in all regions
+ and zones and support a virtio memory balloon device.
+
+config TERRAFORM_GCE_MACHINE_E2_STANDARD_2
+ bool "e2-standard-2"
+ depends on TARGET_ARCH_X86_64
+ help
+ 2 vCPUs (1 core) and 8GB of memory.
+
+config TERRAFORM_GCE_MACHINE_E2_STANDARD_4
+ bool "e2-standard-4"
+ depends on TARGET_ARCH_X86_64
+ help
+ 4 vCPUs (2 cores) and 16GB of memory.
+
+config TERRAFORM_GCE_MACHINE_E2_STANDARD_8
+ bool "e2-standard-8"
+ depends on TARGET_ARCH_X86_64
+ help
+ 8 vCPUs (4 cores) and 32GB of memory.
+
+config TERRAFORM_GCE_MACHINE_E2_STANDARD_16
+ bool "e2-standard-16"
+ depends on TARGET_ARCH_X86_64
+ help
+ 16 vCPUs (8 cores) and 64GB of memory.
+
+config TERRAFORM_GCE_MACHINE_E2_STANDARD_32
+ bool "e2-standard-32"
+ depends on TARGET_ARCH_X86_64
+ help
+ 32 vCPUs (16 cores) and 128GB of memory.
+
+endchoice
+
+config TERRAFORM_GCE_MACHINE_TYPE
+ string
+ output yaml
+ default "e2-standard-2" if TERRAFORM_GCE_MACHINE_E2_STANDARD_2
+ default "e2-standard-4" if TERRAFORM_GCE_MACHINE_E2_STANDARD_4
+ default "e2-standard-8" if TERRAFORM_GCE_MACHINE_E2_STANDARD_8
+ default "e2-standard-16" if TERRAFORM_GCE_MACHINE_E2_STANDARD_16
+ default "e2-standard-32" if TERRAFORM_GCE_MACHINE_E2_STANDARD_32
+
+config TERRAFORM_GCE_IMAGE_TYPE
+ string
+ output yaml
+ default "pd-balanced"
+
+endif # TERRAFORM_GCE_MACHINE_FAMILY_E2_STANDARD
diff --git a/terraform/gce/kconfigs/machines/Kconfig.n1-highcpu b/terraform/gce/kconfigs/machines/Kconfig.n1-highcpu
new file mode 100644
index 000000000000..7684b2961962
--- /dev/null
+++ b/terraform/gce/kconfigs/machines/Kconfig.n1-highcpu
@@ -0,0 +1,55 @@
+if TERRAFORM_GCE_MACHINE_FAMILY_N1_HIGHCPU
+
+choice
+ prompt "GCE Machine type"
+ default TERRAFORM_GCE_MACHINE_N1_HIGHCPU_8
+ help
+ The N1 machine series is Compute Engine's first generation
+ general-purpose machine series available on Intel Skylake,
+ Broadwell, Haswell, Sandy Bridge, and Ivy Bridge CPU
+ platforms.
+
+config TERRAFORM_GCE_MACHINE_N1_HIGHCPU_2
+ bool "n1-highcpu-2"
+ help
+ 2 vCPUs (1 core) and 1.8GB of memory.
+
+config TERRAFORM_GCE_MACHINE_N1_HIGHCPU_4
+ bool "n1-highcpu-4"
+ help
+ 4 vCPUs (2 cores) and 3.6GB of memory.
+
+config TERRAFORM_GCE_MACHINE_N1_HIGHCPU_8
+ bool "n1-highcpu-8"
+ help
+ 8 vCPUs (4 cores) and 7.2GB of memory.
+
+config TERRAFORM_GCE_MACHINE_N1_HIGHCPU_16
+ bool "n1-highcpu-16"
+ depends on TARGET_ARCH_X86_64
+ help
+ 16 vCPUs (8 cores) and 14.4GB of memory.
+
+config TERRAFORM_GCE_MACHINE_N1_HIGHCPU_32
+ bool "n1-highcpu-32"
+ depends on TARGET_ARCH_X86_64
+ help
+ 32 vCPUs (16 cores) and 28.8GB of memory.
+
+endchoice
+
+config TERRAFORM_GCE_MACHINE_TYPE
+ string
+ output yaml
+ default "n1-highcpu-2" if TERRAFORM_GCE_MACHINE_N1_HIGHCPU_2
+ default "n1-highcpu-4" if TERRAFORM_GCE_MACHINE_N1_HIGHCPU_4
+ default "n1-highcpu-8" if TERRAFORM_GCE_MACHINE_N1_HIGHCPU_8
+ default "n1-highcpu-16" if TERRAFORM_GCE_MACHINE_N1_HIGHCPU_16
+ default "n1-highcpu-32" if TERRAFORM_GCE_MACHINE_N1_HIGHCPU_32
+
+config TERRAFORM_GCE_IMAGE_TYPE
+ string
+ output yaml
+ default "pd-balanced"
+
+endif # TERRAFORM_GCE_MACHINE_FAMILY_N1_HIGHCPU
diff --git a/terraform/gce/kconfigs/machines/Kconfig.n1-standard b/terraform/gce/kconfigs/machines/Kconfig.n1-standard
index 65dbd672893d..7201231c74a0 100644
--- a/terraform/gce/kconfigs/machines/Kconfig.n1-standard
+++ b/terraform/gce/kconfigs/machines/Kconfig.n1-standard
@@ -4,12 +4,10 @@ choice
prompt "GCE Machine type"
default TERRAFORM_GCE_MACHINE_N1_STANDARD_8
help
- This option sets the GCE machine type. For other machine types,
- refer to this page:
-
- https://cloud.google.com/compute/docs/machine-types
-
- Documentation: https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_instance#machine_type
+ The N1 machine series is Compute Engine's first generation
+ general-purpose machine series available on Intel Skylake,
+ Broadwell, Haswell, Sandy Bridge, and Ivy Bridge CPU
+ platforms.
config TERRAFORM_GCE_MACHINE_N1_STANDARD_1
bool "n1-standard-1"
@@ -19,23 +17,30 @@ config TERRAFORM_GCE_MACHINE_N1_STANDARD_1
config TERRAFORM_GCE_MACHINE_N1_STANDARD_2
bool "n1-standard-2"
help
- 2 vCPU (1 core) and 7.5GB of memory.
+ 2 vCPUs (1 core) and 7.5GB of memory.
config TERRAFORM_GCE_MACHINE_N1_STANDARD_4
bool "n1-standard-4"
help
- 4 vCPU (2 cores) and 15GB of memory.
+ 4 vCPUs (2 cores) and 15GB of memory.
config TERRAFORM_GCE_MACHINE_N1_STANDARD_8
bool "n1-standard-8"
help
- 8 vCPU (4 cores) and 30GB of memory.
+ 8 vCPUs (4 cores) and 30GB of memory.
config TERRAFORM_GCE_MACHINE_N1_STANDARD_16
bool "n1-standard-16"
depends on TARGET_ARCH_X86_64
help
- 16 vCPU (8 cores) and 60GB of memory.
+ 16 vCPUs (8 cores) and 60GB of memory.
+
+config TERRAFORM_GCE_MACHINE_N1_STANDARD_32
+ bool "n1-standard-32"
+ depends on TARGET_ARCH_X86_64
+ help
+ 32 vCPUs (16 cores) and 120GB of memory.
+
endchoice
config TERRAFORM_GCE_MACHINE_TYPE
@@ -46,6 +51,7 @@ config TERRAFORM_GCE_MACHINE_TYPE
default "n1-standard-4" if TERRAFORM_GCE_MACHINE_N1_STANDARD_4
default "n1-standard-8" if TERRAFORM_GCE_MACHINE_N1_STANDARD_8
default "n1-standard-16" if TERRAFORM_GCE_MACHINE_N1_STANDARD_16
+ default "n1-standard-32" if TERRAFORM_GCE_MACHINE_N1_STANDARD_32
config TERRAFORM_GCE_IMAGE_TYPE
string
diff --git a/terraform/gce/kconfigs/machines/Kconfig.n2-highcpu b/terraform/gce/kconfigs/machines/Kconfig.n2-highcpu
index 8aa6893c7252..83823753dc93 100644
--- a/terraform/gce/kconfigs/machines/Kconfig.n2-highcpu
+++ b/terraform/gce/kconfigs/machines/Kconfig.n2-highcpu
@@ -4,40 +4,38 @@ choice
prompt "GCE Machine type"
default TERRAFORM_GCE_MACHINE_N2_HIGHCPU_4
help
- This option sets the GCE machine type. For other machine
- types, refer to this page:
-
- https://cloud.google.com/compute/docs/machine-types
+ The N2 machine series can run on either Intel Cascade Lake
+ (on smaller configurations) or Intel Ice Lake.
config TERRAFORM_GCE_MACHINE_N2_HIGHCPU_2
bool "n2-highcpu-2"
depends on TARGET_ARCH_X86_64
help
- 2 vCPU (1 core) and 2GB of memory.
+ 2 vCPUs (1 core) and 2GB of memory.
config TERRAFORM_GCE_MACHINE_N2_HIGHCPU_4
bool "n2-highcpu-4"
depends on TARGET_ARCH_X86_64
help
- 4 vCPU (2 core) and 4GB of memory.
+ 4 vCPUs (2 cores) and 4GB of memory.
config TERRAFORM_GCE_MACHINE_N2_HIGHCPU_8
bool "n2-highcpu-8"
depends on TARGET_ARCH_X86_64
help
- 8 vCPU (4 cores) and 8GB of memory.
+ 8 vCPUs (4 cores) and 8GB of memory.
config TERRAFORM_GCE_MACHINE_N2_HIGHCPU_16
bool "n2-highcpu-16"
depends on TARGET_ARCH_X86_64
help
- 16 vCPU (8 cores) and 16GB of memory.
+ 16 vCPUs (8 cores) and 16GB of memory.
config TERRAFORM_GCE_MACHINE_N2_HIGHCPU_32
bool "n2-highcpu-32"
depends on TARGET_ARCH_X86_64
help
- 32 vCPU (16 cores) and 32GB of memory.
+ 32 vCPUs (16 cores) and 32GB of memory.
endchoice
diff --git a/terraform/gce/kconfigs/machines/Kconfig.n2-standard b/terraform/gce/kconfigs/machines/Kconfig.n2-standard
index b7b2d68fa522..a485a754ab44 100644
--- a/terraform/gce/kconfigs/machines/Kconfig.n2-standard
+++ b/terraform/gce/kconfigs/machines/Kconfig.n2-standard
@@ -4,40 +4,38 @@ choice
prompt "GCE Machine type"
default TERRAFORM_GCE_MACHINE_N2_STANDARD_8
help
- This option sets the GCE machine type. For other machine
- types, refer to this page:
-
- https://cloud.google.com/compute/docs/machine-types
+ The N2 machine series can run on either Intel Cascade Lake
+ (on smaller configurations) or Intel Ice Lake.
config TERRAFORM_GCE_MACHINE_N2_STANDARD_2
bool "n2-standard-2"
depends on TARGET_ARCH_X86_64
help
- 2 vCPU (1 core) and 8GB of memory.
+ 2 vCPUs (1 core) and 8GB of memory.
config TERRAFORM_GCE_MACHINE_N2_STANDARD_4
bool "n2-standard-4"
depends on TARGET_ARCH_X86_64
help
- 4 vCPU (2 core) and 16GB of memory.
+ 4 vCPUs (2 cores) and 16GB of memory.
config TERRAFORM_GCE_MACHINE_N2_STANDARD_8
bool "n2-standard-8"
depends on TARGET_ARCH_X86_64
help
- 8 vCPU (4 cores) and 32GB of memory.
+ 8 vCPUs (4 cores) and 32GB of memory.
config TERRAFORM_GCE_MACHINE_N2_STANDARD_16
bool "n2-standard-16"
depends on TARGET_ARCH_X86_64
help
- 16 vCPU (8 cores) and 64GB of memory.
+ 16 vCPUs (8 cores) and 64GB of memory.
config TERRAFORM_GCE_MACHINE_N2_STANDARD_32
bool "n2-standard-32"
depends on TARGET_ARCH_X86_64
help
- 32 vCPU (16 cores) and 128GB of memory.
+ 32 vCPUs (16 cores) and 128GB of memory.
endchoice
diff --git a/terraform/gce/kconfigs/machines/Kconfig.n2d-highcpu b/terraform/gce/kconfigs/machines/Kconfig.n2d-highcpu
index 3050349416fd..e3cf9c6e5c41 100644
--- a/terraform/gce/kconfigs/machines/Kconfig.n2d-highcpu
+++ b/terraform/gce/kconfigs/machines/Kconfig.n2d-highcpu
@@ -4,10 +4,9 @@ choice
prompt "GCE Machine type"
default TERRAFORM_GCE_MACHINE_N2D_HIGHCPU_4
help
- This option sets the GCE machine type. For other machine
- types, refer to this page:
-
- https://cloud.google.com/compute/docs/machine-types
+ The N2D machine series can run on either AMD EPYC Milan or
+ AMD EPYC Rome processors. The third generation AMD EPYC
+ Milan processor is available only in specific regions and zones.
config TERRAFORM_GCE_MACHINE_N2D_HIGHCPU_2
bool "n2d-highcpu-2"
@@ -19,25 +18,25 @@ config TERRAFORM_GCE_MACHINE_N2D_HIGHCPU_4
bool "n2d-highcpu-4"
depends on TARGET_ARCH_X86_64
help
- 4 vCPU (2 core) and 4GB of memory.
+ 4 vCPUs (2 cores) and 4GB of memory.
config TERRAFORM_GCE_MACHINE_N2D_HIGHCPU_8
bool "n2d-highcpu-8"
depends on TARGET_ARCH_X86_64
help
- 8 vCPU (4 cores) and 8GB of memory.
+ 8 vCPUs (4 cores) and 8GB of memory.
config TERRAFORM_GCE_MACHINE_N2D_HIGHCPU_16
bool "n2d-highcpu-16"
depends on TARGET_ARCH_X86_64
help
- 16 vCPU (8 cores) and 16GB of memory.
+ 16 vCPUs (8 cores) and 16GB of memory.
config TERRAFORM_GCE_MACHINE_N2D_HIGHCPU_32
bool "n2d-highcpu-32"
depends on TARGET_ARCH_X86_64
help
- 32 vCPU (16 cores) and 32GB of memory.
+ 32 vCPUs (16 cores) and 32GB of memory.
endchoice
diff --git a/terraform/gce/kconfigs/machines/Kconfig.n2d-standard b/terraform/gce/kconfigs/machines/Kconfig.n2d-standard
index 08744d396595..4f86e0b7d3cf 100644
--- a/terraform/gce/kconfigs/machines/Kconfig.n2d-standard
+++ b/terraform/gce/kconfigs/machines/Kconfig.n2d-standard
@@ -4,40 +4,39 @@ choice
prompt "GCE Machine type"
default TERRAFORM_GCE_MACHINE_N2D_STANDARD_4
help
- This option sets the GCE machine type. For other machine
- types, refer to this page:
-
- https://cloud.google.com/compute/docs/machine-types
+ The N2D machine series can run on either AMD EPYC Milan or
+ AMD EPYC Rome processors. The third generation AMD EPYC
+ Milan processor is available only in specific regions and zones.
config TERRAFORM_GCE_MACHINE_N2D_STANDARD_2
bool "n2d-standard-2"
depends on TARGET_ARCH_X86_64
help
- 2 vCPU (1 core) and 8GB of memory.
+ 2 vCPUs (1 core) and 8GB of memory.
config TERRAFORM_GCE_MACHINE_N2D_STANDARD_4
bool "n2d-standard-4"
depends on TARGET_ARCH_X86_64
help
- 4 vCPU (2 core) and 16GB of memory.
+ 4 vCPUs (2 cores) and 16GB of memory.
config TERRAFORM_GCE_MACHINE_N2D_STANDARD_8
bool "n2d-standard-8"
depends on TARGET_ARCH_X86_64
help
- 8 vCPU (4 cores) and 32GB of memory.
+ 8 vCPUs (4 cores) and 32GB of memory.
config TERRAFORM_GCE_MACHINE_N2D_STANDARD_16
bool "n2d-standard-16"
depends on TARGET_ARCH_X86_64
help
- 16 vCPU (8 cores) and 64GB of memory.
+ 16 vCPUs (8 cores) and 64GB of memory.
config TERRAFORM_GCE_MACHINE_N2D_STANDARD_32
bool "n2d-standard-32"
depends on TARGET_ARCH_X86_64
help
- 32 vCPU (16 cores) and 128GB of memory.
+ 32 vCPUs (16 cores) and 128GB of memory.
endchoice
diff --git a/terraform/gce/kconfigs/machines/Kconfig.n4-highcpu b/terraform/gce/kconfigs/machines/Kconfig.n4-highcpu
index 9f871940a73b..880a386ea01d 100644
--- a/terraform/gce/kconfigs/machines/Kconfig.n4-highcpu
+++ b/terraform/gce/kconfigs/machines/Kconfig.n4-highcpu
@@ -4,35 +4,33 @@ choice
prompt "GCE Machine Type"
default TERRAFORM_GCE_MACHINE_N4_HIGHCPU_4
help
- This option sets the GCE machine type. For other machine
- types, refer to this page:
-
- https://cloud.google.com/compute/docs/machine-types
+ N4 VMs are powered by the 5th generation Intel Xeon Scalable
+ processors (code-named Emerald Rapids) and Titanium.
config TERRAFORM_GCE_MACHINE_N4_HIGHCPU_2
bool "n4-highcpu-2"
help
- 2 vCPU (1 core) and 4GB of memory.
+ 2 vCPUs (1 core) and 4GB of memory.
config TERRAFORM_GCE_MACHINE_N4_HIGHCPU_4
bool "n4-highcpu-4"
help
- 4 vCPU (2 core) and 8GB of memory.
+ 4 vCPUs (2 cores) and 8GB of memory.
config TERRAFORM_GCE_MACHINE_N4_HIGHCPU_8
bool "n4-highcpu-8"
help
- 8 vCPU (4 cores) and 16GB of memory.
+ 8 vCPUs (4 cores) and 16GB of memory.
config TERRAFORM_GCE_MACHINE_N4_HIGHCPU_16
bool "n4-highcpu-16"
help
- 16 vCPU (8 cores) and 32GB of memory.
+ 16 vCPUs (8 cores) and 32GB of memory.
config TERRAFORM_GCE_MACHINE_N4_HIGHCPU_32
bool "n4-highcpu-32"
help
- 32 vCPU (16 cores) and 64GB of memory.
+ 32 vCPUs (16 cores) and 64GB of memory.
endchoice
diff --git a/terraform/gce/kconfigs/machines/Kconfig.n4-standard b/terraform/gce/kconfigs/machines/Kconfig.n4-standard
index d1d1202cbb7b..807f8638e865 100644
--- a/terraform/gce/kconfigs/machines/Kconfig.n4-standard
+++ b/terraform/gce/kconfigs/machines/Kconfig.n4-standard
@@ -4,35 +4,33 @@ choice
prompt "GCE Machine Type"
default TERRAFORM_GCE_MACHINE_N4_STANDARD_4
help
- This option sets the GCE machine type. For other machine
- types, refer to this page:
-
- https://cloud.google.com/compute/docs/machine-types
+ N4 VMs are powered by the 5th generation Intel Xeon Scalable
+ processors (code-named Emerald Rapids) and Titanium.
config TERRAFORM_GCE_MACHINE_N4_STANDARD_2
bool "n4-standard-2"
help
- 2 vCPU (1 core) and 8GB of memory.
+ 2 vCPUs (1 core) and 8GB of memory.
config TERRAFORM_GCE_MACHINE_N4_STANDARD_4
bool "n4-standard-4"
help
- 4 vCPU (2 core) and 16GB of memory.
+ 4 vCPUs (2 cores) and 16GB of memory.
config TERRAFORM_GCE_MACHINE_N4_STANDARD_8
bool "n4-standard-8"
help
- 8 vCPU (4 cores) and 32GB of memory.
+ 8 vCPUs (4 cores) and 32GB of memory.
config TERRAFORM_GCE_MACHINE_N4_STANDARD_16
bool "n4-standard-16"
help
- 16 vCPU (8 cores) and 64GB of memory.
+ 16 vCPUs (8 cores) and 64GB of memory.
config TERRAFORM_GCE_MACHINE_N4_STANDARD_32
bool "n4-standard-32"
help
- 32 vCPU (16 cores) and 128GB of memory.
+ 32 vCPUs (16 cores) and 128GB of memory.
endchoice
--
2.51.0
next prev parent reply other threads:[~2025-08-27 14:28 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-27 14:27 [PATCH v1 00/26] Various fixes Chuck Lever
2025-08-27 14:27 ` [PATCH v1 01/26] scripts: Update gen_ssh_key.sh Chuck Lever
2025-08-27 14:27 ` [PATCH v1 02/26] terraform/azure: Fix count of managed disks Chuck Lever
2025-08-27 14:27 ` [PATCH v1 03/26] terraform/azure: Remove tags from terraform configuration Chuck Lever
2025-08-27 14:27 ` [PATCH v1 04/26] terraform/azure: Enable network acceleration Chuck Lever
2025-08-27 14:28 ` [PATCH v1 05/26] terraform/azure: Make the resource group name a variable Chuck Lever
2025-08-27 14:28 ` [PATCH v1 06/26] terraform/azure: Remove the provider version constraint Chuck Lever
2025-08-27 14:28 ` [PATCH v1 07/26] terraform/azure: Update the RHEL publishers Chuck Lever
2025-08-27 14:28 ` [PATCH v1 08/26] terraform/oci: Work around oracle/oci provider bug Chuck Lever
2025-08-27 14:28 ` [PATCH v1 09/26] terraform/oci: Chuck Lever
2025-08-27 14:28 ` [PATCH v1 10/26] terraform/oci: Enable preemptible compute instances Chuck Lever
2025-08-27 14:28 ` [PATCH v1 11/26] terraform/aws: Fix zone selection for us_west1 Chuck Lever
2025-08-27 14:28 ` [PATCH v1 12/26] Revert "terraform/aws: Add Oracle Linux AMI selections" Chuck Lever
2025-08-27 14:28 ` [PATCH v1 13/26] terraform/aws: Remove unused terraform tags Chuck Lever
2025-08-27 14:28 ` [PATCH v1 14/26] terraform/GCE: Fix the default disk throughput values Chuck Lever
2025-08-27 14:28 ` [PATCH v1 15/26] terraform/gce: Remove unused tags Chuck Lever
2025-08-27 14:28 ` [PATCH v1 16/26] terraform/gce: Remove support for Fedora Chuck Lever
2025-08-27 14:28 ` Chuck Lever [this message]
2025-08-27 18:13 ` [PATCH v1 17/26] terraform/gce: Update existing machine types and introduce new ones Chuck Lever
2025-08-27 14:28 ` [PATCH v1 18/26] terraform: Create the user's .ssh/config if it does not already exist Chuck Lever
2025-08-27 14:28 ` [PATCH v1 19/26] pynfs: Don't install xdrlib3 on older RHEL Chuck Lever
2025-08-27 14:28 ` [PATCH v1 20/26] guestfs: Update the guestfs playbook description Chuck Lever
2025-08-27 14:28 ` [PATCH v1 21/26] gen_hosts: Add 'localhost' to the [all] group Chuck Lever
2025-08-27 14:28 ` [PATCH v1 22/26] gen_host: Add [service] group to the builder template Chuck Lever
2025-08-27 14:28 ` [PATCH v1 23/26] guestfs: Don't run the 'destroy' tags on the controller Chuck Lever
2025-08-27 14:28 ` [PATCH v1 24/26] base_image: Skip "locales-all" package on Fedora Chuck Lever
2025-08-27 14:28 ` [PATCH v1 25/26] update_etc_hosts: ipaddr Chuck Lever
2025-08-27 14:28 ` [PATCH v1 26/26] Add an Ansible requirements.yml file Chuck Lever
2025-08-27 19:16 ` [PATCH v1 00/26] Various fixes Luis Chamberlain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250827142832.2629291-18-cel@kernel.org \
--to=cel@kernel.org \
--cc=chuck.lever@oracle.com \
--cc=kdevops@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox