From 7b1e7d6195dfab6985311de8eb1fe3b8bfe255e4 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 22 Sep 2024 01:21:41 +0000 Subject: [PATCH] Auto commit - CI build --- amazon-eks-ami/CHANGELOG.md | 1596 +++++++++++++++++ amazon-eks-ami/doc/usage/al2023.md | 5 +- .../nodeadm/internal/aws/ecr/ecr.go | 3 +- .../internal/containerd/runtime_config.go | 2 +- .../nodeadm/internal/containerd/sandbox.go | 3 +- .../nodeadm/internal/daemon/interface.go | 15 +- .../nodeadm/internal/daemon/systemd.go | 41 +- .../nodeadm/internal/kubelet/eni-max-pods.txt | 12 + amazon-eks-ami/nodeadm/internal/util/retry.go | 79 +- .../al2023/provisioners/install-nodeadm.sh | 2 - amazon-eks-ami/templates/al2023/template.json | 6 +- .../templates/al2023/variables-default.json | 7 +- .../templates/shared/runtime/eni-max-pods.txt | 12 + 13 files changed, 1742 insertions(+), 41 deletions(-) diff --git a/amazon-eks-ami/CHANGELOG.md b/amazon-eks-ami/CHANGELOG.md index cd3450b5..96919f7a 100644 --- a/amazon-eks-ami/CHANGELOG.md +++ b/amazon-eks-ami/CHANGELOG.md @@ -2,6 +2,1602 @@ +# AMI Release v20240917 +> **Note** +> There are no changes to the AMI template in this release. + +--- + +

AMI Details

+ + + + + + + + + + + + + + + + + + + + + + + + + + +
AMI TypeSource AMI Name
AL2023_ARM_64_STANDARDal2023-ami-minimal-2023.5.20240916.0-kernel-6.1-arm64
AL2023_x86_64_STANDARDal2023-ami-minimal-2023.5.20240916.0-kernel-6.1-x86_64
AL2_ARM_64amzn2-ami-minimal-hvm-2.0.20240903.0-arm64-ebs
AL2_x86_64amzn2-ami-minimal-hvm-2.0.20240903.0-x86_64-ebs
AL2_x86_64_GPUamzn2-ami-minimal-hvm-2.0.20240903.0-x86_64-ebs
+ +
+Kubernetes 1.31 + + + + + + + + + + + + + + + + + + + + + + +
AMI NamesRelease versionIncluded artifacts
amazon-eks-node-al2023-x86_64-standard-1.31-v202409171.31.0-20240917s3://amazon-eks/1.31.0/2024-09-12/
amazon-eks-node-1.31-v20240917
amazon-eks-node-al2023-arm64-standard-1.31-v20240917
amazon-eks-arm64-node-1.31-v20240917
amazon-eks-gpu-node-1.31-v20240917
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2_x86_64AL2_ARM_64AL2_x86_64_GPU
amazon-ssm-agent3.3.380.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda-12-2—12.2.2-1
efa—2.10.0-1.amzn2
kernel5.10.224-212.876.amzn2
nvidia-driver-latest-dkms—550.90.12-1.el7
runc1.1.13-1.amzn2
+ + + + + + + + + + + + + + + + + + + + + + +
PackageAL2023_x86_64_STANDARDAL2023_ARM_64_STANDARD
amazon-ssm-agent3.3.380.0-1.amzn2023
containerd1.7.11-1.amzn2023.0.1
kernel6.1.109-118.189.amzn2023
runc1.1.13-1.amzn2023.0.1
+
+ +
+Kubernetes 1.30 + + + + + + + + + + + + + + + + + + + + + + +
AMI NamesRelease versionIncluded artifacts
amazon-eks-node-al2023-x86_64-standard-1.30-v202409171.30.4-20240917s3://amazon-eks/1.30.4/2024-09-11/
amazon-eks-node-1.30-v20240917
amazon-eks-node-al2023-arm64-standard-1.30-v20240917
amazon-eks-arm64-node-1.30-v20240917
amazon-eks-gpu-node-1.30-v20240917
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2_x86_64AL2_ARM_64AL2_x86_64_GPU
amazon-ssm-agent3.3.380.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda-12-2—12.2.2-1
efa—2.10.0-1.amzn2
kernel5.10.224-212.876.amzn2
nvidia-driver-latest-dkms—550.90.12-1.el7
runc1.1.13-1.amzn2
+ + + + + + + + + + + + + + + + + + + + + + +
PackageAL2023_x86_64_STANDARDAL2023_ARM_64_STANDARD
amazon-ssm-agent3.3.380.0-1.amzn2023
containerd1.7.11-1.amzn2023.0.1
kernel6.1.109-118.189.amzn2023
runc1.1.13-1.amzn2023.0.1
+
+ +
+Kubernetes 1.29 + + + + + + + + + + + + + + + + + + + + + + +
AMI NamesRelease versionIncluded artifacts
amazon-eks-node-al2023-x86_64-standard-1.29-v202409171.29.8-20240917s3://amazon-eks/1.29.8/2024-09-11/
amazon-eks-node-1.29-v20240917
amazon-eks-node-al2023-arm64-standard-1.29-v20240917
amazon-eks-arm64-node-1.29-v20240917
amazon-eks-gpu-node-1.29-v20240917
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2_x86_64AL2_ARM_64AL2_x86_64_GPU
amazon-ssm-agent3.3.380.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda-12-2—12.2.2-1
efa—2.10.0-1.amzn2
kernel5.10.224-212.876.amzn2
nvidia-driver-latest-dkms—550.90.12-1.el7
runc1.1.13-1.amzn2
+ + + + + + + + + + + + + + + + + + + + + + +
PackageAL2023_x86_64_STANDARDAL2023_ARM_64_STANDARD
amazon-ssm-agent3.3.380.0-1.amzn2023
containerd1.7.11-1.amzn2023.0.1
kernel6.1.109-118.189.amzn2023
runc1.1.13-1.amzn2023.0.1
+
+ +
+Kubernetes 1.28 + + + + + + + + + + + + + + + + + + + + + + +
AMI NamesRelease versionIncluded artifacts
amazon-eks-node-al2023-x86_64-standard-1.28-v202409171.28.13-20240917s3://amazon-eks/1.28.13/2024-09-11/
amazon-eks-node-1.28-v20240917
amazon-eks-node-al2023-arm64-standard-1.28-v20240917
amazon-eks-arm64-node-1.28-v20240917
amazon-eks-gpu-node-1.28-v20240917
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2_x86_64AL2_ARM_64AL2_x86_64_GPU
amazon-ssm-agent3.3.380.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda-12-2—12.2.2-1
efa—2.10.0-1.amzn2
kernel5.10.224-212.876.amzn2
nvidia-driver-latest-dkms—550.90.12-1.el7
runc1.1.13-1.amzn2
+ + + + + + + + + + + + + + + + + + + + + + +
PackageAL2023_x86_64_STANDARDAL2023_ARM_64_STANDARD
amazon-ssm-agent3.3.380.0-1.amzn2023
containerd1.7.11-1.amzn2023.0.1
kernel6.1.109-118.189.amzn2023
runc1.1.13-1.amzn2023.0.1
+
+ +
+Kubernetes 1.27 + + + + + + + + + + + + + + + + + + + + + + +
AMI NamesRelease versionIncluded artifacts
amazon-eks-node-al2023-x86_64-standard-1.27-v202409171.27.16-20240917s3://amazon-eks/1.27.16/2024-09-11/
amazon-eks-node-1.27-v20240917
amazon-eks-node-al2023-arm64-standard-1.27-v20240917
amazon-eks-arm64-node-1.27-v20240917
amazon-eks-gpu-node-1.27-v20240917
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2_x86_64AL2_ARM_64AL2_x86_64_GPU
amazon-ssm-agent3.3.380.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda-12-2—12.2.2-1
efa—2.10.0-1.amzn2
kernel5.10.224-212.876.amzn2
nvidia-driver-latest-dkms—550.90.12-1.el7
runc1.1.13-1.amzn2
+ + + + + + + + + + + + + + + + + + + + + + +
PackageAL2023_x86_64_STANDARDAL2023_ARM_64_STANDARD
amazon-ssm-agent3.3.380.0-1.amzn2023
containerd1.7.11-1.amzn2023.0.1
kernel6.1.109-118.189.amzn2023
runc1.1.13-1.amzn2023.0.1
+
+ +
+Kubernetes 1.26 + + + + + + + + + + + + + + + + + + + + + + +
AMI NamesRelease versionIncluded artifacts
amazon-eks-node-al2023-x86_64-standard-1.26-v202409171.26.15-20240917s3://amazon-eks/1.26.15/2024-09-11/
amazon-eks-node-1.26-v20240917
amazon-eks-node-al2023-arm64-standard-1.26-v20240917
amazon-eks-arm64-node-1.26-v20240917
amazon-eks-gpu-node-1.26-v20240917
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2_x86_64AL2_ARM_64AL2_x86_64_GPU
amazon-ssm-agent3.3.380.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda-12-2—12.2.2-1
efa—2.10.0-1.amzn2
kernel5.10.224-212.876.amzn2
nvidia-driver-latest-dkms—550.90.12-1.el7
runc1.1.13-1.amzn2
+ + + + + + + + + + + + + + + + + + + + + + +
PackageAL2023_x86_64_STANDARDAL2023_ARM_64_STANDARD
amazon-ssm-agent3.3.380.0-1.amzn2023
containerd1.7.11-1.amzn2023.0.1
kernel6.1.109-118.189.amzn2023
runc1.1.13-1.amzn2023.0.1
+
+ +
+Kubernetes 1.25 + + + + + + + + + + + + + + + + + + + + + + +
AMI NamesRelease versionIncluded artifacts
amazon-eks-node-al2023-x86_64-standard-1.25-v202409171.25.16-20240917s3://amazon-eks/1.25.16/2024-09-11/
amazon-eks-node-1.25-v20240917
amazon-eks-node-al2023-arm64-standard-1.25-v20240917
amazon-eks-arm64-node-1.25-v20240917
amazon-eks-gpu-node-1.25-v20240917
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2_x86_64AL2_ARM_64AL2_x86_64_GPU
amazon-ssm-agent3.3.380.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda-12-2—12.2.2-1
efa—2.10.0-1.amzn2
kernel5.10.224-212.876.amzn2
nvidia-driver-latest-dkms—550.90.12-1.el7
runc1.1.13-1.amzn2
+ + + + + + + + + + + + + + + + + + + + + + +
PackageAL2023_x86_64_STANDARDAL2023_ARM_64_STANDARD
amazon-ssm-agent3.3.380.0-1.amzn2023
containerd1.7.11-1.amzn2023.0.1
kernel6.1.109-118.189.amzn2023
runc1.1.13-1.amzn2023.0.1
+
+ +
+Kubernetes 1.24 + + + + + + + + + + + + + + + + + + + + + + +
AMI NamesRelease versionIncluded artifacts
amazon-eks-node-al2023-x86_64-standard-1.24-v202409171.24.17-20240917s3://amazon-eks/1.24.17/2024-09-11/
amazon-eks-node-1.24-v20240917
amazon-eks-node-al2023-arm64-standard-1.24-v20240917
amazon-eks-arm64-node-1.24-v20240917
amazon-eks-gpu-node-1.24-v20240917
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2_x86_64AL2_ARM_64AL2_x86_64_GPU
amazon-ssm-agent3.3.380.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda-12-2—12.2.2-1
docker25.0.6-1.amzn2.0.2
kernel5.10.224-212.876.amzn2
nvidia-driver-latest-dkms—550.90.12-1.el7
runc1.1.13-1.amzn2
+ + + + + + + + + + + + + + + + + + + + + + +
PackageAL2023_x86_64_STANDARDAL2023_ARM_64_STANDARD
amazon-ssm-agent3.3.380.0-1.amzn2023
containerd1.7.11-1.amzn2023.0.1
kernel6.1.109-118.189.amzn2023
runc1.1.13-1.amzn2023.0.1
+
+ +
+Kubernetes 1.23 + + + + + + + + + + + + + + + + + + + + + + +
AMI NamesRelease versionIncluded artifacts
amazon-eks-node-al2023-x86_64-standard-1.23-v202409171.23.17-20240917s3://amazon-eks/1.23.17/2024-09-11/
amazon-eks-node-1.23-v20240917
amazon-eks-node-al2023-arm64-standard-1.23-v20240917
amazon-eks-arm64-node-1.23-v20240917
amazon-eks-gpu-node-1.23-v20240917
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2_x86_64AL2_ARM_64AL2_x86_64_GPU
amazon-ssm-agent3.3.380.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda-12-2—12.2.2-1
docker25.0.6-1.amzn2.0.2
kernel5.10.224-212.876.amzn2
nvidia-driver-latest-dkms—550.90.12-1.el7
runc1.1.13-1.amzn2
+ + + + + + + + + + + + + + + + + + + + + + +
PackageAL2023_x86_64_STANDARDAL2023_ARM_64_STANDARD
amazon-ssm-agent3.3.380.0-1.amzn2023
containerd1.7.11-1.amzn2023.0.1
kernel6.1.109-118.189.amzn2023
runc1.1.13-1.amzn2023.0.1
+
+ + +--- + + +# AMI Release v20240910 + + +## What's Changed +* Add additional ecr provider patterns by @ndbaker1 in https://github.com/awslabs/amazon-eks-ami/pull/1954 +* Add new region ecr accounts and domains by @ndbaker1 in https://github.com/awslabs/amazon-eks-ami/pull/1956 +* Wait for networking to be up before loading NVIDIA kernel modules by @nkvetsinski in https://github.com/awslabs/amazon-eks-ami/pull/1962 + +## New Contributors +* @brc made their first contribution in https://github.com/awslabs/amazon-eks-ami/pull/1955 + +**Full Changelog**: https://github.com/awslabs/amazon-eks-ami/compare/v20240904...v20240910 + +--- + +

AMI Details

+ + + + + + + + + + + + + + + + + + + + + + + + + + +
AMI TypeSource AMI Name
AL2023_ARM_64_STANDARDal2023-ami-minimal-2023.5.20240903.0-kernel-6.1-arm64
AL2023_x86_64_STANDARDal2023-ami-minimal-2023.5.20240903.0-kernel-6.1-x86_64
AL2_ARM_64amzn2-ami-minimal-hvm-2.0.20240903.0-arm64-ebs
AL2_x86_64amzn2-ami-minimal-hvm-2.0.20240903.0-x86_64-ebs
AL2_x86_64_GPUamzn2-ami-minimal-hvm-2.0.20240903.0-x86_64-ebs
+ +
+Kubernetes 1.30 + + + + + + + + + + + + + + + + + + + + + + +
AMI NamesRelease versionIncluded artifacts
amazon-eks-node-al2023-x86_64-standard-1.30-v202409101.30.2-20240910s3://amazon-eks/1.30.2/2024-07-12/
amazon-eks-node-1.30-v20240910
amazon-eks-node-al2023-arm64-standard-1.30-v20240910
amazon-eks-arm64-node-1.30-v20240910
amazon-eks-gpu-node-1.30-v20240910
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2_x86_64AL2_ARM_64AL2_x86_64_GPU
amazon-ssm-agent3.3.380.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda-12-2—12.2.2-1
efa—2.10.0-1.amzn2
kernel5.10.224-212.876.amzn2
nvidia-driver-latest-dkms—550.90.07-1.el7
runc1.1.13-1.amzn2
+ + + + + + + + + + + + + + + + + + + + + + +
PackageAL2023_x86_64_STANDARDAL2023_ARM_64_STANDARD
amazon-ssm-agent3.3.380.0-1.amzn2023
containerd1.7.11-1.amzn2023.0.1
kernel6.1.106-116.188.amzn2023
runc1.1.13-1.amzn2023.0.1
+
+ +
+Kubernetes 1.29 + + + + + + + + + + + + + + + + + + + + + + +
AMI NamesRelease versionIncluded artifacts
amazon-eks-node-al2023-x86_64-standard-1.29-v202409101.29.6-20240910s3://amazon-eks/1.29.6/2024-07-12/
amazon-eks-node-1.29-v20240910
amazon-eks-node-al2023-arm64-standard-1.29-v20240910
amazon-eks-arm64-node-1.29-v20240910
amazon-eks-gpu-node-1.29-v20240910
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2_x86_64AL2_ARM_64AL2_x86_64_GPU
amazon-ssm-agent3.3.380.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda-12-2—12.2.2-1
efa—2.10.0-1.amzn2
kernel5.10.224-212.876.amzn2
nvidia-driver-latest-dkms—550.90.07-1.el7
runc1.1.13-1.amzn2
+ + + + + + + + + + + + + + + + + + + + + + +
PackageAL2023_x86_64_STANDARDAL2023_ARM_64_STANDARD
amazon-ssm-agent3.3.380.0-1.amzn2023
containerd1.7.11-1.amzn2023.0.1
kernel6.1.106-116.188.amzn2023
runc1.1.13-1.amzn2023.0.1
+
+ +
+Kubernetes 1.28 + + + + + + + + + + + + + + + + + + + + + + +
AMI NamesRelease versionIncluded artifacts
amazon-eks-node-al2023-x86_64-standard-1.28-v202409101.28.11-20240910s3://amazon-eks/1.28.11/2024-07-12/
amazon-eks-node-1.28-v20240910
amazon-eks-node-al2023-arm64-standard-1.28-v20240910
amazon-eks-arm64-node-1.28-v20240910
amazon-eks-gpu-node-1.28-v20240910
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2_x86_64AL2_ARM_64AL2_x86_64_GPU
amazon-ssm-agent3.3.380.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda-12-2—12.2.2-1
efa—2.10.0-1.amzn2
kernel5.10.224-212.876.amzn2
nvidia-driver-latest-dkms—550.90.07-1.el7
runc1.1.13-1.amzn2
+ + + + + + + + + + + + + + + + + + + + + + +
PackageAL2023_x86_64_STANDARDAL2023_ARM_64_STANDARD
amazon-ssm-agent3.3.380.0-1.amzn2023
containerd1.7.11-1.amzn2023.0.1
kernel6.1.106-116.188.amzn2023
runc1.1.13-1.amzn2023.0.1
+
+ +
+Kubernetes 1.27 + + + + + + + + + + + + + + + + + + + + + + +
AMI NamesRelease versionIncluded artifacts
amazon-eks-node-al2023-x86_64-standard-1.27-v202409101.27.15-20240910s3://amazon-eks/1.27.15/2024-07-12/
amazon-eks-node-1.27-v20240910
amazon-eks-node-al2023-arm64-standard-1.27-v20240910
amazon-eks-arm64-node-1.27-v20240910
amazon-eks-gpu-node-1.27-v20240910
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2_x86_64AL2_ARM_64AL2_x86_64_GPU
amazon-ssm-agent3.3.380.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda-12-2—12.2.2-1
efa—2.10.0-1.amzn2
kernel5.10.224-212.876.amzn2
nvidia-driver-latest-dkms—550.90.07-1.el7
runc1.1.13-1.amzn2
+ + + + + + + + + + + + + + + + + + + + + + +
PackageAL2023_x86_64_STANDARDAL2023_ARM_64_STANDARD
amazon-ssm-agent3.3.380.0-1.amzn2023
containerd1.7.11-1.amzn2023.0.1
kernel6.1.106-116.188.amzn2023
runc1.1.13-1.amzn2023.0.1
+
+ +
+Kubernetes 1.26 + + + + + + + + + + + + + + + + + + + + + + +
AMI NamesRelease versionIncluded artifacts
amazon-eks-node-al2023-x86_64-standard-1.26-v202409101.26.15-20240910s3://amazon-eks/1.26.15/2024-07-12/
amazon-eks-node-1.26-v20240910
amazon-eks-node-al2023-arm64-standard-1.26-v20240910
amazon-eks-arm64-node-1.26-v20240910
amazon-eks-gpu-node-1.26-v20240910
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2_x86_64AL2_ARM_64AL2_x86_64_GPU
amazon-ssm-agent3.3.380.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda-12-2—12.2.2-1
efa—2.10.0-1.amzn2
kernel5.10.224-212.876.amzn2
nvidia-driver-latest-dkms—550.90.07-1.el7
runc1.1.13-1.amzn2
+ + + + + + + + + + + + + + + + + + + + + + +
PackageAL2023_x86_64_STANDARDAL2023_ARM_64_STANDARD
amazon-ssm-agent3.3.380.0-1.amzn2023
containerd1.7.11-1.amzn2023.0.1
kernel6.1.106-116.188.amzn2023
runc1.1.13-1.amzn2023.0.1
+
+ +
+Kubernetes 1.25 + + + + + + + + + + + + + + + + + + + + + + +
AMI NamesRelease versionIncluded artifacts
amazon-eks-node-al2023-x86_64-standard-1.25-v202409101.25.16-20240910s3://amazon-eks/1.25.16/2024-07-12/
amazon-eks-node-1.25-v20240910
amazon-eks-node-al2023-arm64-standard-1.25-v20240910
amazon-eks-arm64-node-1.25-v20240910
amazon-eks-gpu-node-1.25-v20240910
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2_x86_64AL2_ARM_64AL2_x86_64_GPU
amazon-ssm-agent3.3.380.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda-12-2—12.2.2-1
efa—2.10.0-1.amzn2
kernel5.10.224-212.876.amzn2
nvidia-driver-latest-dkms—550.90.07-1.el7
runc1.1.13-1.amzn2
+ + + + + + + + + + + + + + + + + + + + + + +
PackageAL2023_x86_64_STANDARDAL2023_ARM_64_STANDARD
amazon-ssm-agent3.3.380.0-1.amzn2023
containerd1.7.11-1.amzn2023.0.1
kernel6.1.106-116.188.amzn2023
runc1.1.13-1.amzn2023.0.1
+
+ +
+Kubernetes 1.24 + + + + + + + + + + + + + + + + + + + + + + +
AMI NamesRelease versionIncluded artifacts
amazon-eks-node-al2023-x86_64-standard-1.24-v202409101.24.17-20240910s3://amazon-eks/1.24.17/2024-07-12/
amazon-eks-node-1.24-v20240910
amazon-eks-node-al2023-arm64-standard-1.24-v20240910
amazon-eks-arm64-node-1.24-v20240910
amazon-eks-gpu-node-1.24-v20240910
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2_x86_64AL2_ARM_64AL2_x86_64_GPU
amazon-ssm-agent3.3.380.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda-12-2—12.2.2-1
docker25.0.6-1.amzn2.0.2
kernel5.10.224-212.876.amzn2
nvidia-driver-latest-dkms—550.90.07-1.el7
runc1.1.13-1.amzn2
+ + + + + + + + + + + + + + + + + + + + + + +
PackageAL2023_x86_64_STANDARDAL2023_ARM_64_STANDARD
amazon-ssm-agent3.3.380.0-1.amzn2023
containerd1.7.11-1.amzn2023.0.1
kernel6.1.106-116.188.amzn2023
runc1.1.13-1.amzn2023.0.1
+
+ +
+Kubernetes 1.23 + + + + + + + + + + + + + + + + + + + + + + +
AMI NamesRelease versionIncluded artifacts
amazon-eks-node-al2023-x86_64-standard-1.23-v202409101.23.17-20240910s3://amazon-eks/1.23.17/2024-07-12/
amazon-eks-node-1.23-v20240910
amazon-eks-node-al2023-arm64-standard-1.23-v20240910
amazon-eks-arm64-node-1.23-v20240910
amazon-eks-gpu-node-1.23-v20240910
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageAL2_x86_64AL2_ARM_64AL2_x86_64_GPU
amazon-ssm-agent3.3.380.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda-12-2—12.2.2-1
docker25.0.6-1.amzn2.0.2
kernel5.10.224-212.876.amzn2
nvidia-driver-latest-dkms—550.90.07-1.el7
runc1.1.13-1.amzn2
+ + + + + + + + + + + + + + + + + + + + + + +
PackageAL2023_x86_64_STANDARDAL2023_ARM_64_STANDARD
amazon-ssm-agent3.3.380.0-1.amzn2023
containerd1.7.11-1.amzn2023.0.1
kernel6.1.106-116.188.amzn2023
runc1.1.13-1.amzn2023.0.1
+
+ + +--- + + # AMI Release v20240904 diff --git a/amazon-eks-ami/doc/usage/al2023.md b/amazon-eks-ami/doc/usage/al2023.md index 51d18804..a609837f 100644 --- a/amazon-eks-ami/doc/usage/al2023.md +++ b/amazon-eks-ami/doc/usage/al2023.md @@ -5,7 +5,6 @@ | Variable | Description | | - | - | -| `enable_accelerator` | Vendor that provides the GPU or accelerator hardware. Currently we support Neuron and NVIDIA. | | `ami_component_description` | | | `ami_description` | | | `ami_name` | | @@ -21,15 +20,17 @@ | `binary_bucket_region` | | | `containerd_version` | | | `creator` | | +| `enable_accelerator` | Vendor that provides the GPU or accelerator hardware. Currently we support Neuron and NVIDIA. | +| `enable_efa` | Valid options are ```true``` or ```false```. Wheather or not to install the software needed to use AWS Elastic Fabric Adapter (EFA) network interfaces. | | `enable_fips` | Install openssl and enable fips related kernel parameters | | `encrypted` | | | `iam_instance_profile` | The name of an IAM instance profile to launch the EC2 instance with. | -| `enable_efa` | Valid options are ```true``` or ```false```. Wheather or not to install the software needed to use AWS Elastic Fabric Adapter (EFA) network interfaces. | | `instance_type` | | | `kms_key_id` | | | `kubernetes_build_date` | | | `kubernetes_version` | | | `launch_block_device_mappings_volume_size` | | +| `nodeadm_build_image` | Image to use as a build environment for nodeadm | | `nvidia_driver_major_version` | To be used only when ```enable_accelerator = nvidia```. Driver version to install, depends on what is available in NVIDIA repository. | | `remote_folder` | Directory path for shell provisioner scripts on the builder instance | | `runc_version` | | diff --git a/amazon-eks-ami/nodeadm/internal/aws/ecr/ecr.go b/amazon-eks-ami/nodeadm/internal/aws/ecr/ecr.go index c7001898..3e317c31 100644 --- a/amazon-eks-ami/nodeadm/internal/aws/ecr/ecr.go +++ b/amazon-eks-ami/nodeadm/internal/aws/ecr/ecr.go @@ -6,7 +6,6 @@ import ( "go.uber.org/zap" "net" "strings" - "time" "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/ecr" @@ -23,7 +22,7 @@ func GetAuthorizationToken(awsRegion string) (string, error) { } ecrClient := ecr.NewFromConfig(awsConfig) var token *ecr.GetAuthorizationTokenOutput - err = util.RetryExponentialBackoff(3, 2*time.Second, func() error { + err = util.NewRetrier(util.WithBackoffExponential()).Retry(context.TODO(), func() error { token, err = ecrClient.GetAuthorizationToken(context.Background(), &ecr.GetAuthorizationTokenInput{}) return err }) diff --git a/amazon-eks-ami/nodeadm/internal/containerd/runtime_config.go b/amazon-eks-ami/nodeadm/internal/containerd/runtime_config.go index ed933247..4528fee4 100644 --- a/amazon-eks-ami/nodeadm/internal/containerd/runtime_config.go +++ b/amazon-eks-ami/nodeadm/internal/containerd/runtime_config.go @@ -24,7 +24,7 @@ func (m *instanceTypeMixin) matches(instanceType string) bool { var ( // TODO: fetch this list dynamically - nvidiaInstances = []string{"p3", "p3dn", "p4d", "p4de", "p5", "g4", "g4dn", "g5", "g6", "g6e"} + nvidiaInstances = []string{"p3", "p3dn", "p4d", "p4de", "p5", "p5e", "g4", "g4dn", "g5", "g6", "g6e"} NvidiaInstanceTypeMixin = instanceTypeMixin{ instanceFamilies: nvidiaInstances, apply: applyNvidia, diff --git a/amazon-eks-ami/nodeadm/internal/containerd/sandbox.go b/amazon-eks-ami/nodeadm/internal/containerd/sandbox.go index 41c97e31..42c58c1e 100644 --- a/amazon-eks-ami/nodeadm/internal/containerd/sandbox.go +++ b/amazon-eks-ami/nodeadm/internal/containerd/sandbox.go @@ -1,6 +1,7 @@ package containerd import ( + "context" "fmt" "os/exec" "regexp" @@ -44,7 +45,7 @@ func cacheSandboxImage(cfg *api.NodeConfig) error { imageSpec := &v1.ImageSpec{Image: sandboxImage} authConfig := &v1.AuthConfig{Auth: ecrUserToken} - return util.RetryExponentialBackoff(3, 2*time.Second, func() error { + return util.NewRetrier(util.WithBackoffExponential()).Retry(context.TODO(), func() error { zap.L().Info("Pulling sandbox image..", zap.String("image", sandboxImage)) imageRef, err := client.PullImage(imageSpec, authConfig, nil) if err != nil { diff --git a/amazon-eks-ami/nodeadm/internal/daemon/interface.go b/amazon-eks-ami/nodeadm/internal/daemon/interface.go index 4ec53db8..01c75da0 100644 --- a/amazon-eks-ami/nodeadm/internal/daemon/interface.go +++ b/amazon-eks-ami/nodeadm/internal/daemon/interface.go @@ -1,20 +1,21 @@ package daemon -import "github.com/awslabs/amazon-eks-ami/nodeadm/internal/api" +import ( + "github.com/awslabs/amazon-eks-ami/nodeadm/internal/api" +) type Daemon interface { // Configure configures the daemon. Configure(*api.NodeConfig) error - - // EnsureRunning ensures that the daemon is running. - // If the daemon is not running, it will be started. - // If the daemon is already running, and has been re-configured, it will be restarted. + // EnsureRunning ensures that the daemon is running by either + // starting/restarting the daemon, then blocking until the status of the + // daemon reflects that it is running. + // * If the daemon is not running, it will be started. + // * If the daemon is already running, and has been re-configured, it will be restarted. EnsureRunning() error - // PostLaunch runs any additional step that needs to occur after the service // daemon as been started PostLaunch(*api.NodeConfig) error - // Name returns the name of the daemon. Name() string } diff --git a/amazon-eks-ami/nodeadm/internal/daemon/systemd.go b/amazon-eks-ami/nodeadm/internal/daemon/systemd.go index a76db56a..0f27e1cc 100644 --- a/amazon-eks-ami/nodeadm/internal/daemon/systemd.go +++ b/amazon-eks-ami/nodeadm/internal/daemon/systemd.go @@ -5,7 +5,9 @@ package daemon import ( "context" "fmt" + "time" + "github.com/awslabs/amazon-eks-ami/nodeadm/internal/util" "github.com/coreos/go-systemd/v22/dbus" ) @@ -32,21 +34,24 @@ func NewDaemonManager() (DaemonManager, error) { } func (m *systemdDaemonManager) StartDaemon(name string) error { - unitName := getServiceUnitName(name) - _, err := m.conn.StartUnitContext(context.TODO(), unitName, ModeReplace, nil) - return err + if _, err := m.conn.StartUnitContext(context.TODO(), getServiceUnitName(name), ModeReplace, nil); err != nil { + return err + } + return m.waitForStatus(context.TODO(), name, DaemonStatusRunning) } func (m *systemdDaemonManager) StopDaemon(name string) error { - unitName := getServiceUnitName(name) - _, err := m.conn.StopUnitContext(context.TODO(), unitName, ModeReplace, nil) - return err + if _, err := m.conn.StopUnitContext(context.TODO(), getServiceUnitName(name), ModeReplace, nil); err != nil { + return err + } + return m.waitForStatus(context.TODO(), name, DaemonStatusStopped) } func (m *systemdDaemonManager) RestartDaemon(name string) error { - unitName := getServiceUnitName(name) - _, err := m.conn.RestartUnitContext(context.TODO(), unitName, ModeReplace, nil) - return err + if _, err := m.conn.RestartUnitContext(context.TODO(), getServiceUnitName(name), ModeReplace, nil); err != nil { + return err + } + return m.waitForStatus(context.TODO(), name, DaemonStatusRunning) } func (m *systemdDaemonManager) GetDaemonStatus(name string) (DaemonStatus, error) { @@ -55,7 +60,7 @@ func (m *systemdDaemonManager) GetDaemonStatus(name string) (DaemonStatus, error if err != nil { return DaemonStatusUnknown, err } - switch status.Value.String() { + switch status.Value.Value().(string) { case "active": return DaemonStatusRunning, nil case "inactive": @@ -102,3 +107,19 @@ func (m *systemdDaemonManager) Close() { func getServiceUnitName(name string) string { return fmt.Sprintf("%s.service", name) } + +func (m *systemdDaemonManager) waitForStatus(ctx context.Context, name string, targetStatus DaemonStatus) error { + return util.NewRetrier( + util.WithRetryAlways(), + util.WithBackoffFixed(250*time.Millisecond), + ).Retry(ctx, func() error { + status, err := m.GetDaemonStatus(name) + if err != nil { + return err + } + if status != targetStatus { + return fmt.Errorf("%s status is not %q", name, targetStatus) + } + return nil + }) +} diff --git a/amazon-eks-ami/nodeadm/internal/kubelet/eni-max-pods.txt b/amazon-eks-ami/nodeadm/internal/kubelet/eni-max-pods.txt index b984d3d1..b3102da2 100644 --- a/amazon-eks-ami/nodeadm/internal/kubelet/eni-max-pods.txt +++ b/amazon-eks-ami/nodeadm/internal/kubelet/eni-max-pods.txt @@ -858,6 +858,18 @@ x2iezn.4xlarge 234 x2iezn.6xlarge 234 x2iezn.8xlarge 234 x2iezn.metal 737 +x8g.12xlarge 234 +x8g.16xlarge 737 +x8g.24xlarge 737 +x8g.2xlarge 58 +x8g.48xlarge 737 +x8g.4xlarge 234 +x8g.8xlarge 234 +x8g.large 29 +x8g.medium 8 +x8g.metal-24xl 737 +x8g.metal-48xl 737 +x8g.xlarge 58 z1d.12xlarge 737 z1d.2xlarge 58 z1d.3xlarge 234 diff --git a/amazon-eks-ami/nodeadm/internal/util/retry.go b/amazon-eks-ami/nodeadm/internal/util/retry.go index 902395f2..ab54e4a1 100644 --- a/amazon-eks-ami/nodeadm/internal/util/retry.go +++ b/amazon-eks-ami/nodeadm/internal/util/retry.go @@ -1,16 +1,73 @@ package util -import "time" - -func RetryExponentialBackoff(attempts int, initial time.Duration, f func() error) error { - var err error - wait := initial - for i := 0; i < attempts; i++ { - if err = f(); err == nil { - return nil +import ( + "context" + "time" +) + +type Retrier struct { + ConditionFn func(*Retrier) bool + BackoffFn func(*Retrier) time.Duration + + LastErr error + LastWait time.Duration + LastIter int +} + +func (r *Retrier) Retry(ctx context.Context, fn func() error) error { + for r.LastIter = 0; r.ConditionFn(r); r.LastIter++ { + if r.LastErr = fn(); r.LastErr == nil { + return r.LastErr + } + select { + case <-ctx.Done(): + return ctx.Err() + default: + time.Sleep(r.LastWait) + r.LastWait = r.BackoffFn(r) } - time.Sleep(wait) - wait *= 2 } - return err + return r.LastErr +} + +type fnOpt func(*Retrier) + +func NewRetrier(fnOpts ...fnOpt) *Retrier { + retrier := Retrier{ + LastErr: nil, + LastIter: 0, + LastWait: time.Second, + } + for _, fn := range append([]fnOpt{ + WithRetryCount(5), + WithBackoffExponential(), + }, fnOpts...) { + fn(&retrier) + } + return &retrier +} + +func WithRetryCount(maxAttempts int) fnOpt { + return func(r *Retrier) { + r.ConditionFn = func(r *Retrier) bool { return r.LastIter < maxAttempts } + } +} + +func WithRetryAlways() fnOpt { + return func(r *Retrier) { + r.ConditionFn = func(r *Retrier) bool { return true } + } +} + +func WithBackoffFixed(interval time.Duration) fnOpt { + return func(r *Retrier) { + r.LastWait = interval + r.BackoffFn = func(r *Retrier) time.Duration { return interval } + } +} + +func WithBackoffExponential() fnOpt { + return func(r *Retrier) { + r.BackoffFn = func(r *Retrier) time.Duration { return r.LastWait * 2 } + } } diff --git a/amazon-eks-ami/templates/al2023/provisioners/install-nodeadm.sh b/amazon-eks-ami/templates/al2023/provisioners/install-nodeadm.sh index 5582ddb3..72db2d4b 100644 --- a/amazon-eks-ami/templates/al2023/provisioners/install-nodeadm.sh +++ b/amazon-eks-ami/templates/al2023/provisioners/install-nodeadm.sh @@ -4,8 +4,6 @@ set -o pipefail set -o nounset set -o errexit -BUILD_IMAGE=public.ecr.aws/eks-distro-build-tooling/golang:1.22 - sudo systemctl start containerd sudo nerdctl run \ diff --git a/amazon-eks-ami/templates/al2023/template.json b/amazon-eks-ami/templates/al2023/template.json index 26b30daf..9300eef5 100644 --- a/amazon-eks-ami/templates/al2023/template.json +++ b/amazon-eks-ami/templates/al2023/template.json @@ -1,7 +1,6 @@ { "_comment": "All template variables are enumerated here; and most variables have a default value defined in a variables.json for each kubernetes minor version", "variables": { - "enable_accelerator": null, "ami_component_description": null, "ami_description": null, "ami_name": null, @@ -17,15 +16,17 @@ "binary_bucket_region": null, "containerd_version": null, "creator": null, + "enable_accelerator": null, + "enable_efa": null, "enable_fips": null, "encrypted": null, "iam_instance_profile": null, - "enable_efa": null, "instance_type": null, "kms_key_id": null, "kubernetes_build_date": null, "kubernetes_version": null, "launch_block_device_mappings_volume_size": null, + "nodeadm_build_image": null, "nvidia_driver_major_version": null, "remote_folder": null, "runc_version": null, @@ -211,6 +212,7 @@ "remote_folder": "{{ user `remote_folder`}}", "script": "{{template_dir}}/provisioners/install-nodeadm.sh", "environment_vars": [ + "BUILD_IMAGE={{user `nodeadm_build_image`}}", "PROJECT_DIR={{user `working_dir`}}/nodeadm" ] }, diff --git a/amazon-eks-ami/templates/al2023/variables-default.json b/amazon-eks-ami/templates/al2023/variables-default.json index ed96485f..b010a269 100644 --- a/amazon-eks-ami/templates/al2023/variables-default.json +++ b/amazon-eks-ami/templates/al2023/variables-default.json @@ -1,5 +1,4 @@ { - "enable_accelerator": "", "ami_component_description": "(k8s: {{ user `kubernetes_version` }}, containerd: {{ user `containerd_version` }})", "ami_description": "EKS-optimized Kubernetes node based on Amazon Linux 2023", "ami_regions": "", @@ -13,12 +12,14 @@ "binary_bucket_region": "us-west-2", "containerd_version": "1.7.11-*", "creator": "{{env `USER`}}", + "enable_accelerator": "", + "enable_efa": "false", "enable_fips": "false", "encrypted": "false", - "kms_key_id": "", "iam_instance_profile": "", - "enable_efa": "false", + "kms_key_id": "", "launch_block_device_mappings_volume_size": "20", + "nodeadm_build_image": "public.ecr.aws/eks-distro-build-tooling/golang:1.23", "nvidia_driver_major_version": "555", "remote_folder": "/tmp", "runc_version": "*", diff --git a/amazon-eks-ami/templates/shared/runtime/eni-max-pods.txt b/amazon-eks-ami/templates/shared/runtime/eni-max-pods.txt index b984d3d1..b3102da2 100644 --- a/amazon-eks-ami/templates/shared/runtime/eni-max-pods.txt +++ b/amazon-eks-ami/templates/shared/runtime/eni-max-pods.txt @@ -858,6 +858,18 @@ x2iezn.4xlarge 234 x2iezn.6xlarge 234 x2iezn.8xlarge 234 x2iezn.metal 737 +x8g.12xlarge 234 +x8g.16xlarge 737 +x8g.24xlarge 737 +x8g.2xlarge 58 +x8g.48xlarge 737 +x8g.4xlarge 234 +x8g.8xlarge 234 +x8g.large 29 +x8g.medium 8 +x8g.metal-24xl 737 +x8g.metal-48xl 737 +x8g.xlarge 58 z1d.12xlarge 737 z1d.2xlarge 58 z1d.3xlarge 234