From 68d44aeb60fc001a260ad4d257adcbc40a78e809 Mon Sep 17 00:00:00 2001 From: Carter Date: Mon, 12 Feb 2024 11:55:19 -0800 Subject: [PATCH 01/13] Sync main branch to CodeCommit (#1654) --- .github/workflows/sync-to-codecommit.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sync-to-codecommit.yaml b/.github/workflows/sync-to-codecommit.yaml index fda159369..a1748c4ca 100644 --- a/.github/workflows/sync-to-codecommit.yaml +++ b/.github/workflows/sync-to-codecommit.yaml @@ -27,5 +27,5 @@ jobs: - run: git remote add codecommit ${{ secrets.AWS_CODECOMMIT_REPO_URL }} - run: git checkout master - run: git push codecommit master - - run: git checkout al2023 - - run: git push codecommit al2023 + - run: git checkout main + - run: git push codecommit main From 5d9020bb1e9aca54901227a98a364deff1ada90d Mon Sep 17 00:00:00 2001 From: Carter Date: Mon, 12 Feb 2024 12:30:31 -0800 Subject: [PATCH 02/13] Add warning about default branch change (#1655) --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 350d47f35..e8ed05096 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,13 @@ # Amazon EKS AMI Build Specification +## ⚠️ The default branch of this repository is changing! + +Development will continue on `main`. The default branch of this repository will be changed to `main` on **February 29, 2024**. The `master` branch will be deleted on **March 30, 2024**. + +This change coincides with a reorganization of the project sources. You may continue using the `master` branch as you update your downstream dependencies, but you'll need to explicitly check out the `master` branch after February 29, 2024. + +--- + This repository contains resources and configuration scripts for building a custom Amazon EKS AMI with [HashiCorp Packer](https://www.packer.io/). This is the same configuration that Amazon EKS uses to create the official Amazon From e988b53449984d3438306a26ddaac6408ae3a4f1 Mon Sep 17 00:00:00 2001 From: Carter Date: Mon, 12 Feb 2024 14:25:25 -0800 Subject: [PATCH 03/13] Change docs branch to main (#1657) --- .github/workflows/deploy-docs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-docs.yaml b/.github/workflows/deploy-docs.yaml index 30328b76a..33ee10d43 100644 --- a/.github/workflows/deploy-docs.yaml +++ b/.github/workflows/deploy-docs.yaml @@ -3,7 +3,7 @@ on: workflow_dispatch: push: branches: - - 'master' + - 'main' jobs: mkdocs: permissions: From 8bb63f545e74e00eb3a2b919f147ad5cfce51725 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 20:05:12 -0800 Subject: [PATCH 04/13] Update CHANGELOG.md for release v20240209 (#1660) Co-authored-by: GitHub --- CHANGELOG.md | 419 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 418 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91505ef8a..b4925eb17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,423 @@ +# AMI Release v20240209 + + +## What's Changed +* Specify region for local zones in sandbox image ecr auth by @ndbaker1 in https://github.com/awslabs/amazon-eks-ami/pull/1626 +* Fix CHANGELOG space errors by @cartermckinnon in https://github.com/awslabs/amazon-eks-ami/pull/1647 + + +**Full Changelog**: https://github.com/awslabs/amazon-eks-ami/compare/v20240202...v20240209 + +--- + +

AMI Details

+ + +
+Kubernetes 1.29 + + + + + + + + + + + + + + + + + +
AMI namesRelease versionIncluded artifacts
amazon-eks-node-1.29-v202402091.29.0-20240209s3://amazon-eks/1.29.0/2024-01-04/
amazon-eks-gpu-node-1.29-v20240209
amazon-eks-arm64-node-1.29-v20240209
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageVersion
amazon-ssm-agent3.2.1705.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda12.2.2-1
efa2.6.0-1.amzn2
kernel5.10.209-198.812.amzn2
nvidia-driver-latest-dkms535.129.03-1.el7
runc1.1.11-1.amzn2
+
+ +
+Kubernetes 1.28 + + + + + + + + + + + + + + + + + +
AMI namesRelease versionIncluded artifacts
amazon-eks-node-1.28-v202402091.28.5-20240209s3://amazon-eks/1.28.5/2024-01-04/
amazon-eks-gpu-node-1.28-v20240209
amazon-eks-arm64-node-1.28-v20240209
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageVersion
amazon-ssm-agent3.2.1705.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda12.2.2-1
efa2.6.0-1.amzn2
kernel5.10.209-198.812.amzn2
nvidia-driver-latest-dkms535.129.03-1.el7
runc1.1.11-1.amzn2
+
+ +
+Kubernetes 1.27 + + + + + + + + + + + + + + + + + +
AMI namesRelease versionIncluded artifacts
amazon-eks-node-1.27-v202402091.27.9-20240209s3://amazon-eks/1.27.9/2024-01-04/
amazon-eks-gpu-node-1.27-v20240209
amazon-eks-arm64-node-1.27-v20240209
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageVersion
amazon-ssm-agent3.2.1705.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda12.2.2-1
efa2.6.0-1.amzn2
kernel5.10.209-198.812.amzn2
nvidia-driver-latest-dkms535.129.03-1.el7
runc1.1.11-1.amzn2
+
+ +
+Kubernetes 1.26 + + + + + + + + + + + + + + + + + +
AMI namesRelease versionIncluded artifacts
amazon-eks-node-1.26-v202402091.26.12-20240209s3://amazon-eks/1.26.12/2024-01-04/
amazon-eks-gpu-node-1.26-v20240209
amazon-eks-arm64-node-1.26-v20240209
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageVersion
amazon-ssm-agent3.2.1705.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda12.2.2-1
efa2.6.0-1.amzn2
kernel5.10.209-198.812.amzn2
nvidia-driver-latest-dkms535.129.03-1.el7
runc1.1.11-1.amzn2
+
+ +
+Kubernetes 1.25 + + + + + + + + + + + + + + + + + +
AMI namesRelease versionIncluded artifacts
amazon-eks-node-1.25-v202402091.25.16-20240209s3://amazon-eks/1.25.16/2024-01-04/
amazon-eks-gpu-node-1.25-v20240209
amazon-eks-arm64-node-1.25-v20240209
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageVersion
amazon-ssm-agent3.2.1705.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda12.2.2-1
efa2.6.0-1.amzn2
kernel5.10.209-198.812.amzn2
nvidia-driver-latest-dkms535.129.03-1.el7
runc1.1.11-1.amzn2
+
+ +
+Kubernetes 1.24 + + + + + + + + + + + + + + + + + +
AMI namesRelease versionIncluded artifacts
amazon-eks-node-1.24-v202402091.24.17-20240209s3://amazon-eks/1.24.17/2024-01-04/
amazon-eks-gpu-node-1.24-v20240209
amazon-eks-arm64-node-1.24-v20240209
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageVersion
amazon-ssm-agent3.2.1705.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda11.4.0-1
docker20.10.25-1.amzn2.0.4
kernel5.10.209-198.812.amzn2
nvidia-driver-latest-dkms470.182.03-1.el7
runc1.1.11-1.amzn2
+
+ +
+Kubernetes 1.23 + + + + + + + + + + + + + + + + + +
AMI namesRelease versionIncluded artifacts
amazon-eks-node-1.23-v202402091.23.17-20240209s3://amazon-eks/1.23.17/2024-01-04/
amazon-eks-gpu-node-1.23-v20240209
amazon-eks-arm64-node-1.23-v20240209
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageVersion
amazon-ssm-agent3.2.1705.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda11.4.0-1
docker20.10.25-1.amzn2.0.4
kernel5.4.268-181.368.amzn2
nvidia-driver-latest-dkms470.182.03-1.el7
runc1.1.11-1.amzn2
+
+ + +> **Note** +> A recent change in the Linux kernel caused the EFA and NVIDIA drivers to be incompatible. More information is available in #1494. +> To prevent unexpected failures, the kernel in the GPU AMI will remain at the following versions until we have determined a solution: +> - Kubernetes 1.24 and below: `5.4.254-170.358.amzn2` +> - Kubernetes 1.25 and above: `5.10.192-183.736.amzn2` + +--- + + # AMI Release v20240202 @@ -6971,4 +7388,4 @@ Note: CNI >= 1.2.1 is required for t3 and r5 instance support. * EKS Launch AMI - + \ No newline at end of file From 743862d99ccbe1bb5d3227ab76d2b02d6163ca91 Mon Sep 17 00:00:00 2001 From: Dawid Pichen Date: Tue, 13 Feb 2024 15:16:55 +0100 Subject: [PATCH 05/13] Added missing build target for v1.29; corrected issue with generate-version-info.sh when executed in hardened AMIs --- Makefile | 6 +++++- scripts/generate-version-info.sh | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1a10456bb..079e7fae5 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,7 @@ T_YELLOW := \e[0;33m T_RESET := \e[0m # default to the latest supported Kubernetes version -k8s=1.28 +k8s=1.29 .PHONY: build build: ## Build EKS Optimized AL2 AMI @@ -141,6 +141,10 @@ k8s: validate ## Build default K8s version of EKS Optimized AL2 AMI 1.28: ## Build EKS Optimized AL2 AMI - K8s 1.28 $(MAKE) k8s $(shell hack/latest-binaries.sh 1.28) +.PHONY: 1.29 +1.29: ## Build EKS Optimized AL2 AMI - K8s 1.28 + $(MAKE) k8s $(shell hack/latest-binaries.sh 1.29) + .PHONY: lint-docs lint-docs: ## Lint the docs hack/lint-docs.sh diff --git a/scripts/generate-version-info.sh b/scripts/generate-version-info.sh index 94ded309c..e7d5fa433 100644 --- a/scripts/generate-version-info.sh +++ b/scripts/generate-version-info.sh @@ -16,14 +16,14 @@ OUTPUT_FILE="$1" sudo rpm --query --all --queryformat '\{"%{NAME}": "%{VERSION}-%{RELEASE}"\}\n' | jq --slurp --sort-keys 'add | {packages:(.)}' > "$OUTPUT_FILE" # binaries -KUBELET_VERSION=$(kubelet --version | awk '{print $2}') +KUBELET_VERSION=$(sudo kubelet --version | awk '{print $2}') if [ "$?" != 0 ]; then echo "unable to get kubelet version" exit 1 fi echo $(jq ".binaries.kubelet = \"$KUBELET_VERSION\"" $OUTPUT_FILE) > $OUTPUT_FILE -CLI_VERSION=$(aws --version | awk '{print $1}' | cut -d '/' -f 2) +CLI_VERSION=$(sudo aws --version | awk '{print $1}' | cut -d '/' -f 2) if [ "$?" != 0 ]; then echo "unable to get aws cli version" exit 1 From 3d869141807437005d3acd04fb2a321e6d2c2c6b Mon Sep 17 00:00:00 2001 From: Dawid Pichen Date: Tue, 13 Feb 2024 15:20:59 +0100 Subject: [PATCH 06/13] Corrected version in comment --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 079e7fae5..9ff0c0c0f 100644 --- a/Makefile +++ b/Makefile @@ -142,7 +142,7 @@ k8s: validate ## Build default K8s version of EKS Optimized AL2 AMI $(MAKE) k8s $(shell hack/latest-binaries.sh 1.28) .PHONY: 1.29 -1.29: ## Build EKS Optimized AL2 AMI - K8s 1.28 +1.29: ## Build EKS Optimized AL2 AMI - K8s 1.29 $(MAKE) k8s $(shell hack/latest-binaries.sh 1.29) .PHONY: lint-docs From 1a66915c0569295f665010315f300c97e78cd8f0 Mon Sep 17 00:00:00 2001 From: Dawid Pichen Date: Thu, 15 Feb 2024 10:57:21 +0100 Subject: [PATCH 07/13] Removed unnecessary 1.29 target from Makefile --- Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Makefile b/Makefile index 9ff0c0c0f..25009bc82 100644 --- a/Makefile +++ b/Makefile @@ -141,10 +141,6 @@ k8s: validate ## Build default K8s version of EKS Optimized AL2 AMI 1.28: ## Build EKS Optimized AL2 AMI - K8s 1.28 $(MAKE) k8s $(shell hack/latest-binaries.sh 1.28) -.PHONY: 1.29 -1.29: ## Build EKS Optimized AL2 AMI - K8s 1.29 - $(MAKE) k8s $(shell hack/latest-binaries.sh 1.29) - .PHONY: lint-docs lint-docs: ## Lint the docs hack/lint-docs.sh From 19b77aa4edb64c3690f4326169e8a17a85212198 Mon Sep 17 00:00:00 2001 From: Carter Date: Mon, 12 Feb 2024 12:30:31 -0800 Subject: [PATCH 08/13] Add warning about default branch change (#1655) --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 49ff35c15..1ccc51f0d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,13 @@ # Amazon EKS AMI Build Specification +## ⚠️ The default branch of this repository is changing! + +Development will continue on `main`. The default branch of this repository will be changed to `main` on **February 29, 2024**. The `master` branch will be deleted on **March 30, 2024**. + +This change coincides with a reorganization of the project sources. You may continue using the `master` branch as you update your downstream dependencies, but you'll need to explicitly check out the `master` branch after February 29, 2024. + +--- + This repository contains resources and configuration scripts for building a custom Amazon EKS AMI with [HashiCorp Packer](https://www.packer.io/). This is the same configuration that Amazon EKS uses to create the official Amazon From 351ef4f3df17b4735542ee36aa4c87b4c1274633 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 20:05:12 -0800 Subject: [PATCH 09/13] Update CHANGELOG.md for release v20240209 (#1660) Co-authored-by: GitHub --- CHANGELOG.md | 417 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 417 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06574c913..278b35276 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10790,6 +10790,423 @@ --- +# AMI Release v20240209 + + +## What's Changed +* Specify region for local zones in sandbox image ecr auth by @ndbaker1 in https://github.com/awslabs/amazon-eks-ami/pull/1626 +* Fix CHANGELOG space errors by @cartermckinnon in https://github.com/awslabs/amazon-eks-ami/pull/1647 + + +**Full Changelog**: https://github.com/awslabs/amazon-eks-ami/compare/v20240202...v20240209 + +--- + +

AMI Details

+ + +
+Kubernetes 1.29 + + + + + + + + + + + + + + + + + +
AMI namesRelease versionIncluded artifacts
amazon-eks-node-1.29-v202402091.29.0-20240209s3://amazon-eks/1.29.0/2024-01-04/
amazon-eks-gpu-node-1.29-v20240209
amazon-eks-arm64-node-1.29-v20240209
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageVersion
amazon-ssm-agent3.2.1705.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda12.2.2-1
efa2.6.0-1.amzn2
kernel5.10.209-198.812.amzn2
nvidia-driver-latest-dkms535.129.03-1.el7
runc1.1.11-1.amzn2
+
+ +
+Kubernetes 1.28 + + + + + + + + + + + + + + + + + +
AMI namesRelease versionIncluded artifacts
amazon-eks-node-1.28-v202402091.28.5-20240209s3://amazon-eks/1.28.5/2024-01-04/
amazon-eks-gpu-node-1.28-v20240209
amazon-eks-arm64-node-1.28-v20240209
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageVersion
amazon-ssm-agent3.2.1705.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda12.2.2-1
efa2.6.0-1.amzn2
kernel5.10.209-198.812.amzn2
nvidia-driver-latest-dkms535.129.03-1.el7
runc1.1.11-1.amzn2
+
+ +
+Kubernetes 1.27 + + + + + + + + + + + + + + + + + +
AMI namesRelease versionIncluded artifacts
amazon-eks-node-1.27-v202402091.27.9-20240209s3://amazon-eks/1.27.9/2024-01-04/
amazon-eks-gpu-node-1.27-v20240209
amazon-eks-arm64-node-1.27-v20240209
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageVersion
amazon-ssm-agent3.2.1705.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda12.2.2-1
efa2.6.0-1.amzn2
kernel5.10.209-198.812.amzn2
nvidia-driver-latest-dkms535.129.03-1.el7
runc1.1.11-1.amzn2
+
+ +
+Kubernetes 1.26 + + + + + + + + + + + + + + + + + +
AMI namesRelease versionIncluded artifacts
amazon-eks-node-1.26-v202402091.26.12-20240209s3://amazon-eks/1.26.12/2024-01-04/
amazon-eks-gpu-node-1.26-v20240209
amazon-eks-arm64-node-1.26-v20240209
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageVersion
amazon-ssm-agent3.2.1705.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda12.2.2-1
efa2.6.0-1.amzn2
kernel5.10.209-198.812.amzn2
nvidia-driver-latest-dkms535.129.03-1.el7
runc1.1.11-1.amzn2
+
+ +
+Kubernetes 1.25 + + + + + + + + + + + + + + + + + +
AMI namesRelease versionIncluded artifacts
amazon-eks-node-1.25-v202402091.25.16-20240209s3://amazon-eks/1.25.16/2024-01-04/
amazon-eks-gpu-node-1.25-v20240209
amazon-eks-arm64-node-1.25-v20240209
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageVersion
amazon-ssm-agent3.2.1705.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda12.2.2-1
efa2.6.0-1.amzn2
kernel5.10.209-198.812.amzn2
nvidia-driver-latest-dkms535.129.03-1.el7
runc1.1.11-1.amzn2
+
+ +
+Kubernetes 1.24 + + + + + + + + + + + + + + + + + +
AMI namesRelease versionIncluded artifacts
amazon-eks-node-1.24-v202402091.24.17-20240209s3://amazon-eks/1.24.17/2024-01-04/
amazon-eks-gpu-node-1.24-v20240209
amazon-eks-arm64-node-1.24-v20240209
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageVersion
amazon-ssm-agent3.2.1705.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda11.4.0-1
docker20.10.25-1.amzn2.0.4
kernel5.10.209-198.812.amzn2
nvidia-driver-latest-dkms470.182.03-1.el7
runc1.1.11-1.amzn2
+
+ +
+Kubernetes 1.23 + + + + + + + + + + + + + + + + + +
AMI namesRelease versionIncluded artifacts
amazon-eks-node-1.23-v202402091.23.17-20240209s3://amazon-eks/1.23.17/2024-01-04/
amazon-eks-gpu-node-1.23-v20240209
amazon-eks-arm64-node-1.23-v20240209
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageVersion
amazon-ssm-agent3.2.1705.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda11.4.0-1
docker20.10.25-1.amzn2.0.4
kernel5.4.268-181.368.amzn2
nvidia-driver-latest-dkms470.182.03-1.el7
runc1.1.11-1.amzn2
+
+ + +> **Note** +> A recent change in the Linux kernel caused the EFA and NVIDIA drivers to be incompatible. More information is available in #1494. +> To prevent unexpected failures, the kernel in the GPU AMI will remain at the following versions until we have determined a solution: +> - Kubernetes 1.24 and below: `5.4.254-170.358.amzn2` +> - Kubernetes 1.25 and above: `5.10.192-183.736.amzn2` + +--- + + # AMI Release v20240202 From 5d286d7675e73b11b4fe0c0fdd143f5de8f56e55 Mon Sep 17 00:00:00 2001 From: Dawid Pichen Date: Tue, 13 Feb 2024 15:16:55 +0100 Subject: [PATCH 10/13] Added missing build target for v1.29; corrected issue with generate-version-info.sh when executed in hardened AMIs --- Makefile | 6 +++++- templates/shared/provisioners/generate-version-info.sh | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index bba89f51d..7343dd743 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ else ifeq ($(aws_region), us-gov-west-1) endif # default to the latest supported Kubernetes version -k8s=1.28 +k8s=1.29 .PHONY: build build: ## Build EKS Optimized AMI, default using AL2, use os_distro=al2023 for AL2023 AMI @@ -121,6 +121,10 @@ k8s: validate ## Build default K8s version of EKS Optimized AMI 1.28: ## Build EKS Optimized AMI - K8s 1.28 - DEPRECATED: use the `k8s` variable instead $(MAKE) k8s $(shell hack/latest-binaries.sh 1.28) +.PHONY: 1.29 +1.29: ## Build EKS Optimized AL2 AMI - K8s 1.28 + $(MAKE) k8s $(shell hack/latest-binaries.sh 1.29) + .PHONY: lint-docs lint-docs: ## Lint the docs hack/lint-docs.sh diff --git a/templates/shared/provisioners/generate-version-info.sh b/templates/shared/provisioners/generate-version-info.sh index d6b5b3c44..4670820d2 100644 --- a/templates/shared/provisioners/generate-version-info.sh +++ b/templates/shared/provisioners/generate-version-info.sh @@ -16,14 +16,14 @@ OUTPUT_FILE="$1" sudo rpm --query --all --queryformat '\{"%{NAME}": "%{VERSION}-%{RELEASE}"\}\n' | jq --slurp --sort-keys 'add | {packages:(.)}' > "$OUTPUT_FILE" # binaries -KUBELET_VERSION=$(kubelet --version | awk '{print $2}') +KUBELET_VERSION=$(sudo kubelet --version | awk '{print $2}') if [ "$?" != 0 ]; then echo "unable to get kubelet version" exit 1 fi echo $(jq ".binaries.kubelet = \"$KUBELET_VERSION\"" $OUTPUT_FILE) > $OUTPUT_FILE -CLI_VERSION=$(aws --version | awk '{print $1}' | cut -d '/' -f 2) +CLI_VERSION=$(sudo aws --version | awk '{print $1}' | cut -d '/' -f 2) if [ "$?" != 0 ]; then echo "unable to get aws cli version" exit 1 From 085e4e66917c3fecbb9934663cf355838d52d02c Mon Sep 17 00:00:00 2001 From: Dawid Pichen Date: Tue, 13 Feb 2024 15:20:59 +0100 Subject: [PATCH 11/13] Corrected version in comment --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7343dd743..fa92bd97d 100644 --- a/Makefile +++ b/Makefile @@ -122,7 +122,7 @@ k8s: validate ## Build default K8s version of EKS Optimized AMI $(MAKE) k8s $(shell hack/latest-binaries.sh 1.28) .PHONY: 1.29 -1.29: ## Build EKS Optimized AL2 AMI - K8s 1.28 +1.29: ## Build EKS Optimized AL2 AMI - K8s 1.29 $(MAKE) k8s $(shell hack/latest-binaries.sh 1.29) .PHONY: lint-docs From 99948fb943e687608fcac04324c8ea51748c233d Mon Sep 17 00:00:00 2001 From: Dawid Pichen Date: Thu, 15 Feb 2024 10:57:21 +0100 Subject: [PATCH 12/13] Removed unnecessary 1.29 target from Makefile --- Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Makefile b/Makefile index fa92bd97d..1f26fcb91 100644 --- a/Makefile +++ b/Makefile @@ -121,10 +121,6 @@ k8s: validate ## Build default K8s version of EKS Optimized AMI 1.28: ## Build EKS Optimized AMI - K8s 1.28 - DEPRECATED: use the `k8s` variable instead $(MAKE) k8s $(shell hack/latest-binaries.sh 1.28) -.PHONY: 1.29 -1.29: ## Build EKS Optimized AL2 AMI - K8s 1.29 - $(MAKE) k8s $(shell hack/latest-binaries.sh 1.29) - .PHONY: lint-docs lint-docs: ## Lint the docs hack/lint-docs.sh From ce4e6e1d654ffb5e41d259ff5f9c37f5c78442b0 Mon Sep 17 00:00:00 2001 From: Dawid Pichen Date: Sat, 14 Sep 2024 16:51:25 +0200 Subject: [PATCH 13/13] Restored original files --- CHANGELOG.md | 417 --------------------------------------------------- Makefile | 2 +- README.md | 8 - 3 files changed, 1 insertion(+), 426 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc60da681..cd3450b57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16493,423 +16493,6 @@ --- -# AMI Release v20240209 - - -## What's Changed -* Specify region for local zones in sandbox image ecr auth by @ndbaker1 in https://github.com/awslabs/amazon-eks-ami/pull/1626 -* Fix CHANGELOG space errors by @cartermckinnon in https://github.com/awslabs/amazon-eks-ami/pull/1647 - - -**Full Changelog**: https://github.com/awslabs/amazon-eks-ami/compare/v20240202...v20240209 - ---- - -

AMI Details

- - -
-Kubernetes 1.29 - - - - - - - - - - - - - - - - - -
AMI namesRelease versionIncluded artifacts
amazon-eks-node-1.29-v202402091.29.0-20240209s3://amazon-eks/1.29.0/2024-01-04/
amazon-eks-gpu-node-1.29-v20240209
amazon-eks-arm64-node-1.29-v20240209
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PackageVersion
amazon-ssm-agent3.2.1705.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda12.2.2-1
efa2.6.0-1.amzn2
kernel5.10.209-198.812.amzn2
nvidia-driver-latest-dkms535.129.03-1.el7
runc1.1.11-1.amzn2
-
- -
-Kubernetes 1.28 - - - - - - - - - - - - - - - - - -
AMI namesRelease versionIncluded artifacts
amazon-eks-node-1.28-v202402091.28.5-20240209s3://amazon-eks/1.28.5/2024-01-04/
amazon-eks-gpu-node-1.28-v20240209
amazon-eks-arm64-node-1.28-v20240209
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PackageVersion
amazon-ssm-agent3.2.1705.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda12.2.2-1
efa2.6.0-1.amzn2
kernel5.10.209-198.812.amzn2
nvidia-driver-latest-dkms535.129.03-1.el7
runc1.1.11-1.amzn2
-
- -
-Kubernetes 1.27 - - - - - - - - - - - - - - - - - -
AMI namesRelease versionIncluded artifacts
amazon-eks-node-1.27-v202402091.27.9-20240209s3://amazon-eks/1.27.9/2024-01-04/
amazon-eks-gpu-node-1.27-v20240209
amazon-eks-arm64-node-1.27-v20240209
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PackageVersion
amazon-ssm-agent3.2.1705.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda12.2.2-1
efa2.6.0-1.amzn2
kernel5.10.209-198.812.amzn2
nvidia-driver-latest-dkms535.129.03-1.el7
runc1.1.11-1.amzn2
-
- -
-Kubernetes 1.26 - - - - - - - - - - - - - - - - - -
AMI namesRelease versionIncluded artifacts
amazon-eks-node-1.26-v202402091.26.12-20240209s3://amazon-eks/1.26.12/2024-01-04/
amazon-eks-gpu-node-1.26-v20240209
amazon-eks-arm64-node-1.26-v20240209
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PackageVersion
amazon-ssm-agent3.2.1705.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda12.2.2-1
efa2.6.0-1.amzn2
kernel5.10.209-198.812.amzn2
nvidia-driver-latest-dkms535.129.03-1.el7
runc1.1.11-1.amzn2
-
- -
-Kubernetes 1.25 - - - - - - - - - - - - - - - - - -
AMI namesRelease versionIncluded artifacts
amazon-eks-node-1.25-v202402091.25.16-20240209s3://amazon-eks/1.25.16/2024-01-04/
amazon-eks-gpu-node-1.25-v20240209
amazon-eks-arm64-node-1.25-v20240209
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PackageVersion
amazon-ssm-agent3.2.1705.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda12.2.2-1
efa2.6.0-1.amzn2
kernel5.10.209-198.812.amzn2
nvidia-driver-latest-dkms535.129.03-1.el7
runc1.1.11-1.amzn2
-
- -
-Kubernetes 1.24 - - - - - - - - - - - - - - - - - -
AMI namesRelease versionIncluded artifacts
amazon-eks-node-1.24-v202402091.24.17-20240209s3://amazon-eks/1.24.17/2024-01-04/
amazon-eks-gpu-node-1.24-v20240209
amazon-eks-arm64-node-1.24-v20240209
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PackageVersion
amazon-ssm-agent3.2.1705.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda11.4.0-1
docker20.10.25-1.amzn2.0.4
kernel5.10.209-198.812.amzn2
nvidia-driver-latest-dkms470.182.03-1.el7
runc1.1.11-1.amzn2
-
- -
-Kubernetes 1.23 - - - - - - - - - - - - - - - - - -
AMI namesRelease versionIncluded artifacts
amazon-eks-node-1.23-v202402091.23.17-20240209s3://amazon-eks/1.23.17/2024-01-04/
amazon-eks-gpu-node-1.23-v20240209
amazon-eks-arm64-node-1.23-v20240209
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PackageVersion
amazon-ssm-agent3.2.1705.0-1.amzn2
containerd1.7.11-1.amzn2.0.1
cuda11.4.0-1
docker20.10.25-1.amzn2.0.4
kernel5.4.268-181.368.amzn2
nvidia-driver-latest-dkms470.182.03-1.el7
runc1.1.11-1.amzn2
-
- - -> **Note** -> A recent change in the Linux kernel caused the EFA and NVIDIA drivers to be incompatible. More information is available in #1494. -> To prevent unexpected failures, the kernel in the GPU AMI will remain at the following versions until we have determined a solution: -> - Kubernetes 1.24 and below: `5.4.254-170.358.amzn2` -> - Kubernetes 1.25 and above: `5.10.192-183.736.amzn2` - ---- - - # AMI Release v20240202 diff --git a/Makefile b/Makefile index 90e98f701..8ad193747 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ else ifeq ($(aws_region), us-gov-west-1) endif # default to the latest supported Kubernetes version -k8s=1.29 +k8s=1.28 .PHONY: build build: ## Build EKS Optimized AMI, default using AL2, use os_distro=al2023 for AL2023 AMI diff --git a/README.md b/README.md index 70fcf8880..421cdbb86 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,5 @@ # Amazon EKS AMI Build Specification -## ⚠️ The default branch of this repository is changing! - -Development will continue on `main`. The default branch of this repository will be changed to `main` on **February 29, 2024**. The `master` branch will be deleted on **March 30, 2024**. - -This change coincides with a reorganization of the project sources. You may continue using the `master` branch as you update your downstream dependencies, but you'll need to explicitly check out the `master` branch after February 29, 2024. - ---- - This repository contains resources and configuration scripts for building a custom Amazon EKS AMI with [HashiCorp Packer](https://www.packer.io/). This is the same configuration that Amazon EKS uses to create the official Amazon