fix: Clean up and last minute changes for GA

Author: bryantbiggs

README.md

@@ -276,17 +276,31 @@ module "eks" {
 
   eks_managed_node_groups = {
     example = {
+      # The EKS AL2023 NVIDIA AMI provides all of the necessary components
+      # for accelerated workloads w/ EFA
+      ami_type       = "AL2023_x86_64_NVIDIA"
       instance_types = ["p5.48xlarge"]
 
       # Exposes all EFA interfaces on the launch template created by the node group(s)
       # This would expose all 32 EFA interfaces for the p5.48xlarge instance type
       enable_efa_support = true
 
-      pre_bootstrap_user_data = <<-EOT
-        # Mount NVME instance store volumes since they are typically
-        # available on instance types that support EFA
-        setup-local-disks raid0
-      EOT
+      # Mount instance store volumes in RAID-0 for kubelet and containerd
+      # https://github.com/awslabs/amazon-eks-ami/blob/master/doc/USER_GUIDE.md#raid-0-for-kubelet-and-containerd-raid0
+      cloudinit_pre_nodeadm = [
+        {
+          content_type = "application/node.eks.aws"
+          content      = <<-EOT
+            ---
+            apiVersion: node.eks.aws/v1alpha1
+            kind: NodeConfig
+            spec:
+              instance:
+                localStorage:
+                  strategy: RAID0
+          EOT
+        }
+      ]
 
       # EFA should only be enabled when connecting 2 or more nodes
       # Do not use EFA on a single node workload

examples/eks-auto-mode/README.md

@@ -5,9 +5,16 @@
 To provision the provided configurations you need to execute:
 
 ```bash
-$ terraform init
-$ terraform plan
-$ terraform apply --auto-approve
+terraform init
+terraform plan
+terraform apply --auto-approve
+```
+
+Once the cluster has finished provisioning, you can use the `kubectl` command to interact with the cluster. For example, to deploy a sample deployment and see EKS Auto Mode in action, run:
+
+```bash
+aws eks update-kubeconfig --name $(terraform output -raw cluster_name)
+kubectl apply -f deployment.yaml
 ```
 
 Note that this example may create resources which cost money. Run `terraform destroy` when you don't need these resources.

examples/eks-auto-mode/deployment.yaml

@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   name: inflate
 spec:
-  replicas: 0
+  replicas: 3
   selector:
     matchLabels:
       app: inflate

examples/eks-hybrid-nodes/README.md

@@ -2,6 +2,9 @@
 
 ## Usage
 
+> [!NOTE]
+> The [Packer CLI](https://developer.hashicorp.com/packer/tutorials/docker-get-started/get-started-install-cli) is required to build a custom AMI for the Hybrid node used in the example.
+
 To provision the provided configurations you need to execute:
 
 ```bash

examples/eks-hybrid-nodes/ami/plugins.pkr.hcl

@@ -4,9 +4,5 @@ packer {
       version = "~> 1.2"
       source  = "github.com/hashicorp/amazon"
     }
-    ansible = {
-      version = "~> 1.1"
-      source  = "github.com/hashicorp/ansible"
-    }
   }
 }

examples/eks-hybrid-nodes/ami/variables.pkr.hcl

@@ -1,13 +1,13 @@
 variable "ami_name_prefix" {
   description = "The prefix to use when creating the AMI name. i.e. - `<ami_name_prefix>-<eks_version>-<architecture>-<timestamp>"
   type        = string
-  default     = "amazon-eks-ubuntu"
+  default     = "eks-hybrid-ubuntu"
 }
 
 variable "eks_version" {
   description = "The EKS cluster version associated with the AMI created"
   type        = string
-  default     = "1.30"
+  default     = "1.31"
 }
 
 variable "credential_provider" {
@@ -42,7 +42,7 @@ variable "ami_block_device_mappings" {
 variable "ami_description" {
   description = "The description to use when creating the AMI"
   type        = string
-  default     = "Amazon EKS Ubuntu Hybrid Node AMI"
+  default     = "EKS Hybrid Node demonstration AMI"
 }
 
 variable "ami_groups" {
@@ -651,7 +651,6 @@ variable "temporary_iam_instance_profile_policy_document" {
       Effect = "Allow"
       Action = [
         "ec2:Describe*",
-        "s3:Get*",
       ]
       Resource = ["*"]
     },

examples/eks-hybrid-nodes/remote.tf

@@ -10,16 +10,6 @@ provider "aws" {
 module "eks_hybrid_node_role" {
   source = "../../modules/hybrid-node-role"
 
-  policy_statements = [
-    {
-      actions = [
-        "s3:Get*",
-        "s3:List*",
-      ]
-      resources = ["*"]
-    }
-  ]
-
   tags = local.tags
 }
 

examples/eks-managed-node-group/main.tf

@@ -2,7 +2,13 @@ provider "aws" {
   region = local.region
 }
 
-data "aws_availability_zones" "available" {}
+data "aws_availability_zones" "available" {
+  # Exclude local zones
+  filter {
+    name   = "opt-in-status"
+    values = ["opt-in-not-required"]
+  }
+}
 
 locals {
   name   = "ex-eks-mng"

examples/karpenter/main.tf

@@ -35,7 +35,14 @@ provider "kubectl" {
   }
 }
 
-data "aws_availability_zones" "available" {}
+data "aws_availability_zones" "available" {
+  # Exclude local zones
+  filter {
+    name   = "opt-in-status"
+    values = ["opt-in-not-required"]
+  }
+}
+
 data "aws_ecrpublic_authorization_token" "token" {
   provider = aws.virginia
 }

examples/self-managed-node-group/main.tf

@@ -2,7 +2,13 @@ provider "aws" {
   region = local.region
 }
 
-data "aws_availability_zones" "available" {}
+data "aws_availability_zones" "available" {
+  # Exclude local zones
+  filter {
+    name   = "opt-in-status"
+    values = ["opt-in-not-required"]
+  }
+}
 
 locals {
   name   = "ex-self-mng"