feat: Upgrade to latest Karpenter and s3 mount example

ai-ml/trainium-inferentia/main.tf

@@ -52,4 +52,4 @@ locals {
     Blueprint  = local.name
     GithubRepo = "github.com/awslabs/data-on-eks"
   }
-}
+}

analytics/terraform/spark-k8s-operator/README.md

@@ -27,10 +27,10 @@ Checkout the [documentation website](https://awslabs.github.io/data-on-eks/docs/
 | Name | Source | Version |
 |------|--------|---------|
 | <a name="module_amp_ingest_irsa"></a> [amp\_ingest\_irsa](#module\_amp\_ingest\_irsa) | aws-ia/eks-blueprints-addon/aws | ~> 1.0 |
-| <a name="module_ebs_csi_driver_irsa"></a> [ebs\_csi\_driver\_irsa](#module\_ebs\_csi\_driver\_irsa) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.20 |
+| <a name="module_ebs_csi_driver_irsa"></a> [ebs\_csi\_driver\_irsa](#module\_ebs\_csi\_driver\_irsa) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.34 |
 | <a name="module_eks"></a> [eks](#module\_eks) | terraform-aws-modules/eks/aws | ~> 19.15 |
 | <a name="module_eks_blueprints_addons"></a> [eks\_blueprints\_addons](#module\_eks\_blueprints\_addons) | aws-ia/eks-blueprints-addons/aws | ~> 1.2 |
-| <a name="module_eks_data_addons"></a> [eks\_data\_addons](#module\_eks\_data\_addons) | aws-ia/eks-data-addons/aws | ~> 1.2.9 |
+| <a name="module_eks_data_addons"></a> [eks\_data\_addons](#module\_eks\_data\_addons) | aws-ia/eks-data-addons/aws | ~> 1.30 |
 | <a name="module_s3_bucket"></a> [s3\_bucket](#module\_s3\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> 3.0 |
 | <a name="module_spark_team_a_irsa"></a> [spark\_team\_a\_irsa](#module\_spark\_team\_a\_irsa) | aws-ia/eks-blueprints-addon/aws | ~> 1.0 |
 | <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 |

analytics/terraform/spark-k8s-operator/addons.tf

@@ -3,7 +3,7 @@
 #---------------------------------------------------------------
 module "ebs_csi_driver_irsa" {
   source                = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
-  version               = "~> 5.20"
+  version               = "~> 5.34"
   role_name_prefix      = format("%s-%s-", local.name, "ebs-csi-driver")
   attach_ebs_csi_policy = true
   oidc_providers = {
@@ -90,7 +90,7 @@ module "eks_blueprints_addons" {
     }
   }
   karpenter = {
-    chart_version       = "v0.33.1"
+    chart_version       = "v0.34.0"
     repository_username = data.aws_ecrpublic_authorization_token.token.user_name
     repository_password = data.aws_ecrpublic_authorization_token.token.password
   }
@@ -173,7 +173,7 @@ module "eks_blueprints_addons" {
 #---------------------------------------------------------------
 module "eks_data_addons" {
   source  = "aws-ia/eks-data-addons/aws"
-  version = "~> 1.2.9" # ensure to update this to the latest/desired version
+  version = "~> 1.30" # ensure to update this to the latest/desired version
 
   oidc_provider_arn = module.eks.oidc_provider_arn
 
@@ -193,29 +193,7 @@ module "eks_data_addons" {
         securityGroupSelectorTerms:
           tags:
             Name: ${module.eks.cluster_name}-node
-        userData: |
-          MIME-Version: 1.0
-          Content-Type: multipart/mixed; boundary="BOUNDARY"
-
-          --BOUNDARY
-          Content-Type: text/x-shellscript; charset="us-ascii"
-
-          cat <<-EOF > /etc/profile.d/bootstrap.sh
-          #!/bin/sh
-
-
-          # Configure the NVMe volumes in RAID0 configuration in the bootstrap.sh call.
-          # https://github.com/awslabs/amazon-eks-ami/blob/master/files/bootstrap.sh#L35
-          # This will create a RAID volume and mount it at /mnt/k8s-disks/0
-          #   then mount that volume to /var/lib/kubelet, /var/lib/containerd, and /var/log/pods
-          #   this allows the container daemons and pods to write to the RAID0 by default without needing PersistentVolumes
-          export LOCAL_DISKS='raid0'
-          EOF
-
-          # Source extra environment variables in bootstrap script
-          sed -i '/^set -o errexit/a\\nsource /etc/profile.d/bootstrap.sh' /etc/eks/bootstrap.sh
-
-          --BOUNDARY--
+        instanceStorePolicy: RAID0
 
       nodePool:
         labels:
@@ -245,7 +223,7 @@ module "eks_data_addons" {
             operator: Gt
             values: ["2"]
         limits:
-          cpu: 20 # Change this to 1000 or more for production according to your needs
+          cpu: 1000
         disruption:
           consolidationPolicy: WhenEmpty
           consolidateAfter: 30s
@@ -267,31 +245,7 @@ module "eks_data_addons" {
         securityGroupSelectorTerms:
           tags:
             Name: ${module.eks.cluster_name}-node
-        userData: |
-          MIME-Version: 1.0
-          Content-Type: multipart/mixed; boundary="BOUNDARY"
-
-          --BOUNDARY
-          Content-Type: text/x-shellscript; charset="us-ascii"
-
-          cat <<-EOF > /etc/profile.d/bootstrap.sh
-          #!/bin/sh
-
-
-          # Configure the NVMe volumes in RAID0 configuration in the bootstrap.sh call.
-          # https://github.com/awslabs/amazon-eks-ami/blob/master/files/bootstrap.sh#L35
-          # This will create a RAID volume and mount it at /mnt/k8s-disks/0
-          #   then mount that volume to /var/lib/kubelet, /var/lib/containerd, and /var/log/pods
-          #   this allows the container daemons and pods to write to the RAID0 by default without needing PersistentVolumes
-          export LOCAL_DISKS='raid0'
-          EOF
-
-          # Source extra environment variables in bootstrap script
-          sed -i '/^set -o errexit/a\\nsource /etc/profile.d/bootstrap.sh' /etc/eks/bootstrap.sh
-
-          --BOUNDARY--
-
-
+        instanceStorePolicy: RAID0
       nodePool:
         labels:
           - type: karpenter
@@ -342,35 +296,12 @@ module "eks_data_addons" {
         securityGroupSelectorTerms:
           tags:
             Name: ${module.eks.cluster_name}-node
-        userData: |
-          MIME-Version: 1.0
-          Content-Type: multipart/mixed; boundary="BOUNDARY"
-
-          --BOUNDARY
-          Content-Type: text/x-shellscript; charset="us-ascii"
-
-          cat <<-EOF > /etc/profile.d/bootstrap.sh
-          #!/bin/sh
-
-
-          # Configure the NVMe volumes in RAID0 configuration in the bootstrap.sh call.
-          # https://github.com/awslabs/amazon-eks-ami/blob/master/files/bootstrap.sh#L35
-          # This will create a RAID volume and mount it at /mnt/k8s-disks/0
-          #   then mount that volume to /var/lib/kubelet, /var/lib/containerd, and /var/log/pods
-          #   this allows the container daemons and pods to write to the RAID0 by default without needing PersistentVolumes
-          export LOCAL_DISKS='raid0'
-          EOF
-
-          # Source extra environment variables in bootstrap script
-          sed -i '/^set -o errexit/a\\nsource /etc/profile.d/bootstrap.sh' /etc/eks/bootstrap.sh
-
-          --BOUNDARY--
+        instanceStorePolicy: RAID0
 
       nodePool:
         labels:
           - type: karpenter
-          - NodeGroupType: SparkComputeOptimized
-          - multiArch: Spark
+          - NodeGroupType: SparkMemoryOptimized
         requirements:
           - key: "karpenter.sh/capacity-type"
             operator: In