feat: Add nested_virtualization to launch config

jdubs · jdubs · commit a774a15e396d · 2026-03-10T15:50:13.000-05:00
- Add nested_virtualization to launch template cpu_options block (enabled/disabled)
- Extend cpu_options variable type and document valid values
- Bump AWS provider constraint to &gt;= 6.33 for nested_virtualization support
diff --git a/examples/eks-auto-mode/versions.tf b/examples/eks-auto-mode/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.28"
+      version = ">= 6.33"
     }
   }
 }
diff --git a/examples/eks-capabilities/versions.tf b/examples/eks-capabilities/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.28"
+      version = ">= 6.33"
     }
   }
 }
diff --git a/examples/eks-hybrid-nodes/versions.tf b/examples/eks-hybrid-nodes/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.28"
+      version = ">= 6.33"
     }
     helm = {
       source  = "hashicorp/helm"
diff --git a/examples/eks-managed-node-group/versions.tf b/examples/eks-managed-node-group/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.28"
+      version = ">= 6.33"
     }
   }
 }
diff --git a/examples/karpenter/versions.tf b/examples/karpenter/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.28"
+      version = ">= 6.33"
     }
     helm = {
       source  = "hashicorp/helm"
diff --git a/examples/self-managed-node-group/versions.tf b/examples/self-managed-node-group/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.28"
+      version = ">= 6.33"
     }
   }
 }
diff --git a/modules/capability/versions.tf b/modules/capability/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.28"
+      version = ">= 6.33"
     }
     time = {
       source  = "hashicorp/time"
diff --git a/modules/eks-managed-node-group/main.tf b/modules/eks-managed-node-group/main.tf
@@ -147,9 +147,10 @@ resource "aws_launch_template" "this" {
     for_each = var.cpu_options != null ? [var.cpu_options] : []
 
     content {
-      amd_sev_snp      = cpu_options.value.amd_sev_snp
-      core_count       = cpu_options.value.core_count
-      threads_per_core = cpu_options.value.threads_per_core
+      amd_sev_snp           = cpu_options.value.amd_sev_snp
+      core_count            = cpu_options.value.core_count
+      nested_virtualization = try(cpu_options.value.nested_virtualization, null)
+      threads_per_core      = cpu_options.value.threads_per_core
     }
   }
 
diff --git a/modules/eks-managed-node-group/variables.tf b/modules/eks-managed-node-group/variables.tf
@@ -250,11 +250,12 @@ variable "capacity_reservation_specification" {
 }
 
 variable "cpu_options" {
-  description = "The CPU options for the instance"
+  description = "The CPU options for the instance."
   type = object({
-    amd_sev_snp      = optional(string)
-    core_count       = optional(number)
-    threads_per_core = optional(number)
+    amd_sev_snp           = optional(string)
+    core_count            = optional(number)
+    nested_virtualization = optional(string)
+    threads_per_core      = optional(number)
   })
   default = null
 }
diff --git a/modules/eks-managed-node-group/versions.tf b/modules/eks-managed-node-group/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.28"
+      version = ">= 6.33"
     }
   }
 
diff --git a/modules/fargate-profile/versions.tf b/modules/fargate-profile/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.28"
+      version = ">= 6.33"
     }
   }
 
diff --git a/modules/hybrid-node-role/versions.tf b/modules/hybrid-node-role/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.28"
+      version = ">= 6.33"
     }
   }
 
diff --git a/modules/karpenter/versions.tf b/modules/karpenter/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.28"
+      version = ">= 6.33"
     }
   }
 
diff --git a/modules/self-managed-node-group/versions.tf b/modules/self-managed-node-group/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.28"
+      version = ">= 6.33"
     }
   }
 
diff --git a/tests/eks-fargate-profile/versions.tf b/tests/eks-fargate-profile/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.28"
+      version = ">= 6.33"
     }
   }
 }
diff --git a/tests/eks-hybrid-nodes/versions.tf b/tests/eks-hybrid-nodes/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.28"
+      version = ">= 6.33"
     }
     tls = {
       source  = "hashicorp/tls"
diff --git a/tests/eks-managed-node-group/versions.tf b/tests/eks-managed-node-group/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.28"
+      version = ">= 6.33"
     }
   }
 }
diff --git a/tests/self-managed-node-group/versions.tf b/tests/self-managed-node-group/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.28"
+      version = ">= 6.33"
     }
   }
 }
diff --git a/variables.tf b/variables.tf
@@ -1011,9 +1011,10 @@ variable "self_managed_node_groups" {
       }))
     }))
     cpu_options = optional(object({
-      amd_sev_snp      = optional(string)
-      core_count       = optional(number)
-      threads_per_core = optional(number)
+      amd_sev_snp           = optional(string)
+      core_count            = optional(number)
+      nested_virtualization = optional(string)
+      threads_per_core      = optional(number)
     }))
     credit_specification = optional(object({
       cpu_credits = optional(string)
@@ -1342,9 +1343,10 @@ variable "eks_managed_node_groups" {
       }))
     }))
     cpu_options = optional(object({
-      amd_sev_snp      = optional(string)
-      core_count       = optional(number)
-      threads_per_core = optional(number)
+      amd_sev_snp           = optional(string)
+      core_count            = optional(number)
+      nested_virtualization = optional(string)
+      threads_per_core      = optional(number)
     }))
     credit_specification = optional(object({
       cpu_credits = optional(string)
diff --git a/versions.tf b/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.28"
+      version = ">= 6.33"
     }
     tls = {
       source  = "hashicorp/tls"

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ terraform {`
`4`	`4`	`required_providers {`
`5`	`5`	`aws = {`
`6`	`6`	`source = "hashicorp/aws"`
`7`		`- version = ">= 6.28"`
	`7`	`+ version = ">= 6.33"`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,9 +147,10 @@ resource "aws_launch_template" "this" {`
`147`	`147`	`for_each = var.cpu_options != null ? [var.cpu_options] : []`
`148`	`148`
`149`	`149`	`content {`
`150`		`- amd_sev_snp = cpu_options.value.amd_sev_snp`
`151`		`- core_count = cpu_options.value.core_count`
`152`		`- threads_per_core = cpu_options.value.threads_per_core`
	`150`	`+ amd_sev_snp = cpu_options.value.amd_sev_snp`
	`151`	`+ core_count = cpu_options.value.core_count`
	`152`	`+ nested_virtualization = try(cpu_options.value.nested_virtualization, null)`
	`153`	`+ threads_per_core = cpu_options.value.threads_per_core`
`153`	`154`	`}`
`154`	`155`	`}`
`155`	`156`