Merge branch 'existing-vpc' of https://github.com/aws-samples/sample-e2b-on-aws into existing-vpc

Author: linnjia-aws

infra-iac/packer/main.pkr.hcl

@@ -26,18 +26,44 @@ source "amazon-ebs" "orch" {
     owners = ["amazon"] // 或实际拥有此 AMI 的 AWS 账户 ID
     most_recent = true
   }
-  
+
   ssh_username = "ubuntu"
-  
+
   # Enable nested virtualization
   ami_virtualization_type = "hvm"
-  
-  # Use EBS for the root volume
+
+  # Force IMDSv2
+  metadata_options {
+    http_endpoint               = "enabled"
+    http_tokens                 = "required"
+    http_put_response_hop_limit = 1
+  }
+
+  # Tags for the temporary instance and AMI
+  tags = {
+    team        = "GenAI"
+    service     = "GenAI"
+    owner       = "GenAI"
+    cost_center = "GenAI"
+    component   = "GenAI"
+  }
+
+  # Tags for the temporary instance only
+  run_tags = {
+    team        = "GenAI"
+    service     = "GenAI"
+    owner       = "GenAI"
+    cost_center = "GenAI"
+    component   = "GenAI"
+  }
+
+  # Use EBS for the root volume with encryption
   launch_block_device_mappings {
     device_name           = "/dev/sda1"
     volume_size           = 10
     volume_type           = "gp3"
     delete_on_termination = true
+    encrypted             = true
   }
 }
 

infra-iac/terraform/main.tf

@@ -43,7 +43,6 @@ locals {
   common_tags = {
     Environment = var.environment
     Project     = "E2B"
-    Owner       = "AWS"
     ManagedBy   = "Terraform"
   }
 
@@ -416,6 +415,13 @@ resource "aws_launch_template" "server" {
     name = aws_iam_instance_profile.ec2_instance_profile.name
   }
 
+  metadata_options {
+    http_endpoint               = "enabled"
+    http_tokens                 = "required"
+    http_put_response_hop_limit = 1
+    instance_metadata_tags      = "enabled"
+  }
+
   block_device_mappings {
     device_name = "/dev/sda1"
 
@@ -451,7 +457,12 @@ resource "aws_launch_template" "server" {
       local.common_tags,
       {
         Name        = "server-cluster",
-        ec2-e2b-key = "ec2-e2b-value"
+        ec2-e2b-key = "ec2-e2b-value",
+        team        = "GENAI",
+        service     = "GENAI",
+        owner       = "GENAI",
+        cost_center = "GENAI",
+        component   = "GENAI"
       }
     )
   }
@@ -547,7 +558,7 @@ resource "aws_launch_template" "client" {
 
   metadata_options {
     http_endpoint               = "enabled"
-    http_tokens                 = "optional"
+    http_tokens                 = "required"
     http_put_response_hop_limit = 1
     instance_metadata_tags      = "enabled"
   }
@@ -602,7 +613,12 @@ resource "aws_launch_template" "client" {
       local.common_tags,
       {
         Name        = "client-cluster",
-        ec2-e2b-key = "ec2-e2b-value"
+        ec2-e2b-key = "ec2-e2b-value",
+        team        = "GENAI",
+        service     = "GENAI",
+        owner       = "GENAI",
+        cost_center = "GENAI",
+        component   = "GENAI"
       }
     )
   }
@@ -982,6 +998,13 @@ resource "aws_launch_template" "api" {
     name = aws_iam_instance_profile.ec2_instance_profile.name
   }
 
+  metadata_options {
+    http_endpoint               = "enabled"
+    http_tokens                 = "required"
+    http_put_response_hop_limit = 1
+    instance_metadata_tags      = "enabled"
+  }
+
   block_device_mappings {
     device_name = "/dev/sda1"
 
@@ -1021,7 +1044,12 @@ resource "aws_launch_template" "api" {
       local.common_tags,
       {
         Name        = "api-cluster",
-        ec2-e2b-key = "ec2-e2b-value"
+        ec2-e2b-key = "ec2-e2b-value",
+        team        = "GENAI",
+        service     = "GENAI",
+        owner       = "GENAI",
+        cost_center = "GENAI",
+        component   = "GENAI"
       }
     )
   }
@@ -1130,6 +1158,13 @@ resource "aws_launch_template" "build" {
     name = aws_iam_instance_profile.ec2_instance_profile.name
   }
 
+  metadata_options {
+    http_endpoint               = "enabled"
+    http_tokens                 = "required"
+    http_put_response_hop_limit = 1
+    instance_metadata_tags      = "enabled"
+  }
+
   block_device_mappings {
     device_name = "/dev/sda1"
 
@@ -1169,7 +1204,12 @@ resource "aws_launch_template" "build" {
       local.common_tags,
       {
         Name        = "build-cluster",
-        ec2-e2b-key = "ec2-e2b-value"
+        ec2-e2b-key = "ec2-e2b-value",
+        team        = "GENAI",
+        service     = "GENAI",
+        owner       = "GENAI",
+        cost_center = "GENAI",
+        component   = "GENAI"
       }
     )
   }

packages/create_template.sh

@@ -223,11 +223,19 @@ while true; do
 
     if [ "$STATUS" != "building" ]; then
         echo "Build is no longer in 'building' state. Final status: $STATUS"
-        echo "Done!"
         break
     fi
 
     sleep 10
 done
 
-echo "Building completed successfully!"
+# Check final build status
+if [ "$STATUS" = "error" ] || [ "$STATUS" = "failed" ]; then
+    echo "Building failed with status: $STATUS"
+    exit 1
+elif [ "$STATUS" = "ready" ] || [ "$STATUS" = "success" ]; then
+    echo "Building completed successfully!"
+else
+    echo "Building finished with unknown status: $STATUS"
+    exit 1
+fi

packages/upload.sh

@@ -66,7 +66,7 @@ if [ "$ARCHITECTURE" = "arm64" ]; then
     rm -rf release-${latest_version}-aarch64
 else
     # Download kernel
-	curl -L https://s3.amazonaws.com/spec.ccfc.min/firecracker-ci/$CI_VERSION/x86_64/vmlinux-$KERNEL_VERSION -o ${TEMP_DIR}/kernels/${KERNEL_FOLDER}/vmlinux.bin
+    curl -L https://storage.googleapis.com/e2b-prod-public-builds/kernels/vmlinux-6.1.102/vmlinux.bin -o ${TEMP_DIR}/kernels/${KERNEL_FOLDER}/vmlinux.bin
 	# Download firecracker
 	curl -L ${fc_url}/download/${FC_VERSION}/firecracker-${FC_VERSION}-x86_64.tgz | tar -xz
     mv release-${FC_VERSION}-x86_64/firecracker-${FC_VERSION}-x86_64 \