feat: Add Bottlerocket FIPS image variants (#3275)

fix: Add Bottlerocket FIPS image variants
terraform-aws-modules · Jan 17, 2025 · d876ac4 · d876ac4
1 parent a713f6f
commit d876ac4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/modules/_user_data/main.tf b/modules/_user_data/main.tf
@@ -22,6 +22,8 @@ locals {
     AL2_ARM_64                 = "linux"
     BOTTLEROCKET_ARM_64        = "bottlerocket"
     BOTTLEROCKET_x86_64        = "bottlerocket"
+    BOTTLEROCKET_ARM_64_FIPS   = "bottlerocket"
+    BOTTLEROCKET_x86_64_FIPS   = "bottlerocket"
     BOTTLEROCKET_ARM_64_NVIDIA = "bottlerocket"
     BOTTLEROCKET_x86_64_NVIDIA = "bottlerocket"
     WINDOWS_CORE_2019_x86_64   = "windows"

diff --git a/modules/eks-managed-node-group/main.tf b/modules/eks-managed-node-group/main.tf
@@ -355,6 +355,8 @@ locals {
     CUSTOM                     = "NONE"
     BOTTLEROCKET_ARM_64        = "/aws/service/bottlerocket/aws-k8s-${local.ssm_cluster_version}/arm64/latest/image_version"
     BOTTLEROCKET_x86_64        = "/aws/service/bottlerocket/aws-k8s-${local.ssm_cluster_version}/x86_64/latest/image_version"
+    BOTTLEROCKET_ARM_64_FIPS   = "/aws/service/bottlerocket/aws-k8s-${local.ssm_cluster_version}-fips/arm64/latest/image_version"
+    BOTTLEROCKET_x86_64_FIPS   = "/aws/service/bottlerocket/aws-k8s-${local.ssm_cluster_version}-fips/x86_64/latest/image_version"
     BOTTLEROCKET_ARM_64_NVIDIA = "/aws/service/bottlerocket/aws-k8s-${local.ssm_cluster_version}-nvidia/arm64/latest/image_version"
     BOTTLEROCKET_x86_64_NVIDIA = "/aws/service/bottlerocket/aws-k8s-${local.ssm_cluster_version}-nvidia/x86_64/latest/image_version"
     WINDOWS_CORE_2019_x86_64   = "/aws/service/ami-windows-latest/Windows_Server-2019-English-Full-EKS_Optimized-${local.ssm_cluster_version}"

diff --git a/modules/self-managed-node-group/main.tf b/modules/self-managed-node-group/main.tf
@@ -16,6 +16,8 @@ locals {
     AL2_ARM_64                 = "linux"
     BOTTLEROCKET_ARM_64        = "bottlerocket"
     BOTTLEROCKET_x86_64        = "bottlerocket"
+    BOTTLEROCKET_ARM_64_FIPS   = "bottlerocket"
+    BOTTLEROCKET_x86_64_FIPS   = "bottlerocket"
     BOTTLEROCKET_ARM_64_NVIDIA = "bottlerocket"
     BOTTLEROCKET_x86_64_NVIDIA = "bottlerocket"
     WINDOWS_CORE_2019_x86_64   = "windows"
@@ -37,6 +39,8 @@ locals {
     AL2_ARM_64                 = "/aws/service/eks/optimized-ami/${local.ssm_cluster_version}/amazon-linux-2-arm64/recommended/image_id"
     BOTTLEROCKET_ARM_64        = "/aws/service/bottlerocket/aws-k8s-${local.ssm_cluster_version}/arm64/latest/image_id"
     BOTTLEROCKET_x86_64        = "/aws/service/bottlerocket/aws-k8s-${local.ssm_cluster_version}/x86_64/latest/image_id"
+    BOTTLEROCKET_ARM_64_FIPS   = "/aws/service/bottlerocket/aws-k8s-${local.ssm_cluster_version}-fips/arm64/latest/image_id"
+    BOTTLEROCKET_x86_64_FIPS   = "/aws/service/bottlerocket/aws-k8s-${local.ssm_cluster_version}-fips/x86_64/latest/image_id"
     BOTTLEROCKET_ARM_64_NVIDIA = "/aws/service/bottlerocket/aws-k8s-${local.ssm_cluster_version}-nvidia/arm64/latest/image_id"
     BOTTLEROCKET_x86_64_NVIDIA = "/aws/service/bottlerocket/aws-k8s-${local.ssm_cluster_version}-nvidia/x86_64/latest/image_id"
     WINDOWS_CORE_2019_x86_64   = "/aws/service/ami-windows-latest/Windows_Server-2019-English-Full-EKS_Optimized-${local.ssm_cluster_version}/image_id"