addressing feedback

Author: csplinter

latest/ug/ml/ml-eks-k8s-device-plugin.adoc

@@ -92,7 +92,7 @@ ip-192-168-11-225.us-west-2.compute.internal   1
 ip-192-168-24-96.us-west-2.compute.internal    1
 ----
 +
-. Create a file named `nvidia-smi.yaml` with the following contents. Replace [.replaceable]`12.9.1-base-amzn2023` with your desired tag for https://hub.docker.com/r/nvidia/cuda/tags[nvidia/cuda]. This manifest launches an https://developer.nvidia.com/cuda-zone[NVIDIA CUDA] container that runs `nvidia-smi` on a node.
+. Create a file named `nvidia-smi.yaml` with the following contents. This manifest launches a https://docs.aws.amazon.com/linux/al2023/ug/minimal-container.html[minimal AL2023 container image] that runs `nvidia-smi` on a node.
 +
 [source,yaml,subs="verbatim,attributes,quotes"]
 ----
@@ -103,13 +103,18 @@ metadata:
 spec:
   restartPolicy: OnFailure
   containers:
-  - name: nvidia-smi
-    image: nvidia/cuda:12.9.1-base-amzn2023
-    args:
-    - "nvidia-smi"
-    resources:
-      limits:
-        nvidia.com/gpu: 1
+    - name: gpu-demo
+      image: public.ecr.aws/amazonlinux/amazonlinux:2023-minimal
+      command: ['/bin/sh', '-c']
+      args: ['nvidia-smi && tail -f /dev/null']
+      resources:
+        limits:
+          nvidia.com/gpu: 1
+  tolerations:
+    - key: 'nvidia.com/gpu'
+      operator: 'Equal'
+      value: 'true'
+      effect: 'NoSchedule'
 ----
 +
 . Apply the manifest with the following command.
@@ -158,7 +163,7 @@ The following procedure describes how to install the Neuron Kubernetes device pl
 === Prerequisites
 
 * EKS cluster created
-* Neuron GPU nodes running in the cluster using EKS-optimized AL2023 or Bottlerocket Neuron AMI
+* Neuron GPU nodes running in the cluster using EKS-optimized AL2023 Neuron AMI or Bottlerocket AMI
 * Helm installed in your command-line environment, see <<helm,Setup Helm instructions>>.
 
 === Procedure

latest/ug/ml/ml-eks-optimized-ami.adoc

@@ -14,7 +14,7 @@ The table below shows the supported GPU instance types for each EKS-optimized ac
 |EKS AMI variant | EC2 instance types
 
 |AL2023 x86_64 NVIDIA
-|p6-b200, p5, p5e, p5en, p4d, p4de, p3, p3dn, gr6, g6, g6e, g5, g4dn
+|p6-b200, p5, p5e, p5en, p4d, p4de, p3, p3dn, gr6, g6, g6e, g6f, gr6f, g5, g4dn
 
 |AL2023 ARM NVIDIA
 |p6e-gb200, g5g
@@ -23,7 +23,7 @@ The table below shows the supported GPU instance types for each EKS-optimized ac
 |inf1, inf2, trn1, trn2
 
 |Bottlerocket x86_64 aws-k8s-nvidia 
-|p6-b200, p5, p5e, p5en, p4d, p4de, p3, p3dn, gr6, g6, g6e, g5, g4dn
+|p6-b200, p5, p5e, p5en, p4d, p4de, p3, p3dn, gr6, g6, g6e, g6f, gr6f, g5, g4dn
 
 |Bottlerocket aarch64/arm64 aws-k8s-nvidia 
 |g5g
@@ -49,18 +49,20 @@ When using the https://docs.nvidia.com/datacenter/cloud-native/gpu-operator/late
 In addition to the standard EKS AMI components, the EKS-optimized AL2023 NVIDIA AMIs include the following components. 
 
 * NVIDIA driver
-* NVIDIA CUDA runtime libraries
+* NVIDIA CUDA user mode driver
 * NVIDIA container toolkit
 * NVIDIA fabric manager
 * NVIDIA persistenced
 * NVIDIA IMEX driver
 * NVIDIA NVLink Subnet Manager
 * EFA minimal (kernel module and rdma-core)
 
-See the EKS AL2023 NVIDIA AMI https://github.com/awslabs/amazon-eks-ami/blob/main/templates/al2023/provisioners/install-nvidia-driver.sh[installation script] and https://github.com/awslabs/amazon-eks-ami/blob/main/templates/al2023/runtime/gpu/nvidia-kmod-load.sh[kernel loading script] for details on how the EKS AMIs configure the NVIDIA dependencies. See the EKS-optimized https://github.com/awslabs/amazon-eks-ami/releases[AL2023 releases] on GitHub to see the component versions included in the AMIs. You can find the list of installed packages and their versions on a running EC2 instance with the `dnf list installed` command.
+For details on the NVIDIA CUDA user mode driver and the CUDA runtime/libraries used within application containers, see the https://docs.nvidia.com/deploy/cuda-compatibility/why-cuda-compatibility.html#why-cuda-compatibility[NVIDIA documentation]. The CUDA version shown from `nvidia-smi` is the version of the NVIDIA CUDA user mode driver installed on the host, which must be compatible with the CUDA runtime/libraries used in application containers.
 
 To track the status of the EKS-optimized NVIDIA AMIs upgrade to NVIDIA driver 580 version, see https://github.com/awslabs/amazon-eks-ami/issues/2470[GitHub issue #2470]. The NVIDIA 580 driver is required to use CUDA 13+.
 
+See the EKS AL2023 NVIDIA AMI https://github.com/awslabs/amazon-eks-ami/blob/main/templates/al2023/provisioners/install-nvidia-driver.sh[installation script] and https://github.com/awslabs/amazon-eks-ami/blob/main/templates/al2023/runtime/gpu/nvidia-kmod-load.sh[kernel loading script] for details on how the EKS AMIs configure the NVIDIA dependencies. See the EKS-optimized https://github.com/awslabs/amazon-eks-ami/releases[AL2023 releases] on GitHub to see the component versions included in the AMIs. You can find the list of installed packages and their versions on a running EC2 instance with the `dnf list installed` command.
+
 When building custom AMIs with the EKS-optimized AMIs as the base, it is not recommended or supported to run an operating system upgrade (ie. `dnf upgrade`) or upgrade any of the Kubernetes or GPU packages that are included in the EKS-optimized AMIs, as this risks breaking component compatibility. If you do upgrade the operating system or packages that are included in the EKS-optimized AMIs, it is recommended to thoroughly test in a development or staging environment before deploying to production. 
 
 When building custom AMIs for GPU instances, it is recommended to build separate custom AMIs for each instance type generation and family that you will run. The EKS-optimized accelerated AMIs selectively install drivers and packages at runtime based on the underlying instance type generation and family. For more information, see the EKS AMI scripts for https://github.com/awslabs/amazon-eks-ami/blob/main/templates/al2023/provisioners/install-nvidia-driver.sh[installation] and https://github.com/awslabs/amazon-eks-ami/blob/main/templates/al2023/runtime/gpu/nvidia-kmod-load.sh[runtime].
@@ -70,15 +72,17 @@ When building custom AMIs for GPU instances, it is recommended to build separate
 
 When using the https://docs.nvidia.com/datacenter/cloud-native/gpu-operator/latest/overview.html[NVIDIA GPU operator] with the EKS-optimized Bottlerocket NVIDIA AMIs, you must disable the operator installation of the driver, toolkit, and device plugin as these are already included in the EKS AMIs.
 
-In addition to the standard EKS AMI components, the EKS-optimized Bottlerocket NVIDIA AMIs include the following components. 
+In addition to the standard EKS AMI components, the EKS-optimized Bottlerocket NVIDIA AMIs include the following components. The minimal dependencies for EFA (kernel module and rdma-core) are installed in all Bottlerocket variants.
 
 * NVIDIA driver
-* NVIDIA CUDA runtime libraries
+* NVIDIA CUDA user mode driver
 * NVIDIA container toolkit
 * NVIDIA fabric manager
+* NVIDIA persistenced
 * NVIDIA IMEX driver
 * NVIDIA NVLink Subnet Manager
-* EFA minimal (kernel module and rdma-core)
+
+For details on the NVIDIA CUDA user mode driver and the CUDA runtime/libraries used within application containers, see the https://docs.nvidia.com/deploy/cuda-compatibility/why-cuda-compatibility.html#why-cuda-compatibility[NVIDIA documentation]. The CUDA version shown from `nvidia-smi` is the version of the NVIDIA CUDA user mode driver installed on the host, which must be compatible with the CUDA runtime/libraries used in application containers.
 
 See the Bottlerocket Version Information in the https://bottlerocket.dev/en/[Bottlerocket documentation] for details on the installed packages and their versions. The EKS-optimized Bottlerocket NVIDIA AMIs support kernel 6.12 and NVIDIA driver 580 version for Kubernetes versions 1.33 and above. The NVIDIA 580 driver is required to use CUDA 13+.
 

latest/ug/nodes/eks-ami-deprecation-faqs.adoc

@@ -86,7 +86,7 @@ Kubernetes version 1.32 is the last version for which Amazon EKS will release AL
 |Fedora/CentOS 9
 |N/A
 
-|CUDA Toolkit
+|https://docs.nvidia.com/deploy/cuda-compatibility/why-cuda-compatibility.html#why-cuda-compatibility[CUDA user mode driver]
 |12.x
 |12.x
 |12.x,13.x

latest/ug/nodes/eks-optimized-ami.adoc

@@ -7,10 +7,10 @@ include::../attributes.txt[]
 
 [abstract]
 --
-The Amazon EKS optimized Amazon Linux AMIs are built on top of Amazon Linux 2 (AL2) and Amazon Linux 2023 (AL2023). They are configured to serve as the base images for Amazon EKS nodes.
+The Amazon EKS-optimized Amazon Linux AMIs are built on top of Amazon Linux 2 (AL2) and Amazon Linux 2023 (AL2023). They are configured to serve as the base images for Amazon EKS nodes.
 --
 
-The Amazon EKS optimized Amazon Linux AMIs are built on top of Amazon Linux 2 (AL2) and Amazon Linux 2023 (AL2023). They are configured to serve as the base images for Amazon EKS nodes. The AMIs are configured to work with Amazon EKS and they include the following components:
+The Amazon EKS-optimized Amazon Linux AMIs are built on top of Amazon Linux 2 (AL2) and Amazon Linux 2023 (AL2023). They are configured to serve as the base images for Amazon EKS nodes. The AMIs are configured to work with Amazon EKS and they include the following components:
 
 * `kubelet`
 * {aws} IAM Authenticator
@@ -20,7 +20,7 @@ The Amazon EKS optimized Amazon Linux AMIs are built on top of Amazon Linux 2 (A
 ====
 
 * You can track security or privacy events for Amazon Linux at the https://alas.aws.amazon.com/[Amazon Linux security center] by choosing the tab for your desired version. You can also subscribe to the applicable RSS feed. Security and privacy events include an overview of the issue, what packages are affected, and how to update your instances to correct the issue.
-* Before deploying an accelerated or Arm AMI, review the information in <<gpu-ami,Amazon EKS optimized accelerated Amazon Linux AMIs>> and <<arm-ami>>.
+* Before deploying an accelerated or Arm AMI, review the information in <<gpu-ami,Amazon EKS-optimized accelerated Amazon Linux AMIs>> and <<arm-ami>>.
 * Amazon EC2 `P2` instances aren't supported on Amazon EKS because they require `NVIDIA` driver version 470 or earlier.
 * Any newly created managed node groups in clusters on version `1.30` or newer will automatically default to using AL2023 as the node operating system. Previously, new node groups would default to AL2. You can continue to use AL2 by choosing it as the AMI type when creating a new node group.
 * Amazon EKS will no longer publish EKS-optimized Amazon Linux 2 (AL2) AMIs after November 26th, 2025. Additionally, Kubernetes version `1.32` is the last version for which Amazon EKS will release AL2 AMIs. From version `1.33` onwards, Amazon EKS will continue to release AL2023 and Bottlerocket based AMIs.
@@ -30,7 +30,7 @@ The Amazon EKS optimized Amazon Linux AMIs are built on top of Amazon Linux 2 (A
 [#gpu-ami]
 == Amazon EKS-optimized accelerated Amazon Linux AMIs
 
-The Amazon EKS-optimized accelerated Amazon Linux AMIs are built on top of the standard Amazon EKS optimized Amazon Linux AMIs. They are configured to serve as optional images for Amazon EKS nodes to support GPU, link:machine-learning/inferentia/[Inferentia,type="marketing"], and link:machine-learning/trainium/[Trainium,type="marketing"] based workloads.
+The Amazon EKS-optimized accelerated Amazon Linux AMIs are built on top of the standard Amazon EKS-optimized Amazon Linux AMIs. They are configured to serve as optional images for Amazon EKS nodes to support GPU, link:machine-learning/inferentia/[Inferentia,type="marketing"], and link:machine-learning/trainium/[Trainium,type="marketing"] based workloads.
 
 For more information, see <<ml-eks-optimized-ami>>.
 
@@ -47,13 +47,13 @@ Arm instances deliver significant cost savings for scale-out and Arm-based appli
 [#linux-more-information]
 == More information
 
-For more information about using Amazon EKS optimized Amazon Linux AMIs, see the following sections:
+For more information about using Amazon EKS-optimized Amazon Linux AMIs, see the following sections:
 
 * To use Amazon Linux with managed node groups, see <<managed-node-groups>>.
 * To launch self-managed Amazon Linux nodes, see <<retrieve-ami-id>>.
 * For version information, see <<eks-linux-ami-versions>>.
-* To retrieve the latest IDs of the Amazon EKS optimized Amazon Linux AMIs, see <<retrieve-ami-id>>.
-* For open-source scripts that are used to build the Amazon EKS optimized AMIs, see <<eks-ami-build-scripts>>.
+* To retrieve the latest IDs of the Amazon EKS-optimized Amazon Linux AMIs, see <<retrieve-ami-id>>.
+* For open-source scripts that are used to build the Amazon EKS-optimized AMIs, see <<eks-ami-build-scripts>>.
 
 include::al2023.adoc[leveloffset=+1]