Switch to AL2023_ARM_64_STANDARD

Author: bobbyiliev

examples/simple/main.tf

@@ -56,7 +56,6 @@ module "materialize_infrastructure" {
   node_group_min_size                      = 1
   node_group_max_size                      = 2
   node_group_capacity_type                 = "ON_DEMAND"
-  node_group_ami_type                      = "BOTTLEROCKET_ARM_64"
   enable_cluster_creator_admin_permissions = true
 
   # Storage Configuration

modules/eks/bootstrap.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+set -xe
+
+echo "Starting NVMe disk setup"
+
+yum install -y lvm2
+
+ROOT_PART=$(findmnt -n -o SOURCE / | sed 's/\[.*\]//')
+ROOT_DEVICE=$(lsblk -no PKNAME "$ROOT_PART")
+ROOT_DEVICE="/dev/${ROOT_DEVICE}"
+
+NVME_DEVICES=()
+
+for dev in /dev/nvme*n1; do
+  if [ "$dev" != "$ROOT_DEVICE" ] && [ -b "$dev" ]; then
+    NVME_DEVICES+=("$dev")
+  fi
+done
+
+echo "Found NVMe devices: ${NVME_DEVICES[@]:-none}"
+
+if [ ${#NVME_DEVICES[@]} -eq 0 ]; then
+  echo "No NVMe instance storage devices found"
+  exit 0
+fi
+
+for device in "${NVME_DEVICES[@]}"; do
+  pvcreate -f "$device"
+done
+
+vgcreate instance-store-vg "${NVME_DEVICES[@]}"
+
+pvs
+vgs
+
+echo "Disk setup completed"

modules/eks/main.tf

@@ -1,35 +1,7 @@
 locals {
   name_prefix = "${var.namespace}-${var.environment}"
 
-  disk_setup_user_data = base64encode(<<-EOT
-    #!/bin/bash
-    set -xeuo pipefail
-    BOTTLEROCKET_ROOT="/.bottlerocket/rootfs"
-    DRIVE_PATHS=()
-
-    mapfile -t SSD_NVME_DEVICE_LIST < <(lsblk --json --output-all | jq -r '.blockdevices[] | select(.model // empty | contains("Amazon EC2 NVMe Instance Storage")) | .path')
-
-    echo "Found NVMe devices: $${SSD_NVME_DEVICE_LIST[@]}"
-
-    if [ $${#SSD_NVME_DEVICE_LIST[@]} -eq 0 ]; then
-      echo "No NVMe instance storage devices found. Exiting."
-      exit 0
-    fi
-
-    for device in "$${SSD_NVME_DEVICE_LIST[@]}"; do
-      DRIVE_PATHS+=("$${BOTTLEROCKET_ROOT}$${device}")
-    done
-
-    echo "Configuring drives: $${DRIVE_PATHS[@]}"
-
-    for device_path in "$${DRIVE_PATHS[@]}"; do
-      echo "Creating PV on $${device_path}"
-      pvcreate "$${device_path}"
-    done
-
-    vgcreate instance-store-vg "$${DRIVE_PATHS[@]}"
-  EOT
-  )
+  disk_setup_script = file("${path.module}/bootstrap.sh")
 }
 
 module "eks" {
@@ -66,22 +38,12 @@ module "eks" {
         "workload"               = "materialize-instance"
       }
 
-      enable_bootstrap_user_data = true
-
-      bootstrap_extra_args = <<-TOML
-        [settings.bootstrap-containers.default]
-        mode = "once"
-        essential = true
-        user-data = "${local.disk_setup_user_data}"
-      TOML
-
-      # Simpler test to see if the user data is being applied
-      # bootstrap_extra_args = <<-TOML
-      #   [settings.bootstrap-containers.default]
-      #   mode = "once"
-      #   essential = true
-      #   user-data = "IyEvYmluL2Jhc2gKZWNobyBIRUxMTyBXT1JMRA=="
-      # TOML
+      cloudinit_pre_nodeadm = [
+        {
+          content_type = "text/x-shellscript"
+          content      = local.disk_setup_script
+        }
+      ]
 
     }
   }