From aca3704fd77179f3f506fdc8130553085d55aaf0 Mon Sep 17 00:00:00 2001
From: Cam King <camrakin@amazon.com>
Date: Fri, 7 Apr 2023 13:51:19 +0000
Subject: [PATCH 1/2] Updating CHANGELOG.MD for 1.26 Release

---
 CHANGELOG.md | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44e28e823..241a37383 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,62 @@
 # Changelog
 
+### AMI Release v20230405
+* amazon-eks-gpu-node-1.26-v20230405
+* amazon-eks-gpu-node-1.25-v20230405
+* amazon-eks-gpu-node-1.24-v20230405
+* amazon-eks-gpu-node-1.23-v20230405
+* amazon-eks-gpu-node-1.22-v20230405
+* amazon-eks-arm64-node-1.26-v20230405
+* amazon-eks-arm64-node-1.25-v20230405
+* amazon-eks-arm64-node-1.24-v20230405
+* amazon-eks-arm64-node-1.23-v20230405
+* amazon-eks-arm64-node-1.22-v20230405
+* amazon-eks-node-1.26-v20230405
+* amazon-eks-node-1.25-v20230405
+* amazon-eks-node-1.24-v20230405
+* amazon-eks-node-1.23-v20230405
+* amazon-eks-node-1.22-v20230405
+
+[Release versions](https://docs.aws.amazon.com/eks/latest/userguide/eks-linux-ami-versions.html) for these AMIs:
+* `1.26.2-20230405`
+* `1.25.7-20230405`
+* `1.24.11-20230405`
+* `1.23.17-20230405`
+* `1.22.17-20230405`
+
+Binaries used to build these AMIs are published:
+* s3://amazon-eks/1.26.2/2023-03-17/
+* s3://amazon-eks/1.25.7/2023-03-17/
+* s3://amazon-eks/1.24.11/2023-03-17/
+* s3://amazon-eks/1.23.17/2023-03-17/
+* s3://amazon-eks/1.22.17/2023-03-17/
+
+AMI details:
+* `kernel`:
+  * Kubernetes 1.23 and below: 5.4.238-148.346.amzn2
+  * Kubernetes 1.24 and above: 5.10.173-154.642.amzn2
+* `dockerd`: 20.10.17-1.amzn2.0.1
+  * **Note** that Docker is not installed on AMI's with Kubernetes 1.25+.
+* `containerd`: 1.6.19-1.amzn2.0.1
+* `runc`: 1.1.4
+* `cuda`: 11.4.0-1
+* `nvidia-container-runtime-hook`: 1.4.0-1.amzn2
+* `amazon-ssm-agent`: 3.1.1732.0
+
+Notable changes:
+- Add support for Kubernetes 1.26 ([#1246](https://github.com/awslabs/amazon-eks-ami/pull/1246))
+- Add support `inf2`, `trn1n` instance types ([#1251](https://github.com/awslabs/amazon-eks-ami/pull/1251))
+- Updated `containerd` to address:
+  - [ALASDOCKER-2023-023](https://alas.aws.amazon.com/AL2/ALASDOCKER-2023-023.html)
+- Fixed `ecr-credential-provider` flags not being passed correctly to `kubelet` ([#1240](https://github.com/awslabs/amazon-eks-ami/pull/1240))
+  - Added `--image-credential-provider-config` and `--image-credential-provider-bin-dir` flags to the `systemd` units.
+  - Set `KubeletCredentialProviders` feature flag to `true` in the `kubelet` JSON config.
+
+Other changes:
+- Use `gp3 volume_type` for 1.27+ ([#1197](https://github.com/awslabs/amazon-eks-ami/pull/1197))
+- Use default kubelet API QPS for 1.27+ ([#1241](https://github.com/awslabs/amazon-eks-ami/pull/1241))
+- Remove `--container-runtime` kubelet flag for 1.27+ ([#1250](https://github.com/awslabs/amazon-eks-ami/pull/1250))
+
 ### AMI Release v20230322
 * amazon-eks-gpu-node-1.25-v20230322
 * amazon-eks-gpu-node-1.24-v20230322

From 7431d1fda60c391d9637f05c321c253d4d0cff3c Mon Sep 17 00:00:00 2001
From: camrakin <113552683+camrakin@users.noreply.github.com>
Date: Fri, 7 Apr 2023 11:35:40 -0700
Subject: [PATCH 2/2] Updating CHANGELOG.md for v20230406

---
 CHANGELOG.md | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 241a37383..6859fe2db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,28 +1,28 @@
 # Changelog
 
-### AMI Release v20230405
-* amazon-eks-gpu-node-1.26-v20230405
-* amazon-eks-gpu-node-1.25-v20230405
-* amazon-eks-gpu-node-1.24-v20230405
-* amazon-eks-gpu-node-1.23-v20230405
-* amazon-eks-gpu-node-1.22-v20230405
-* amazon-eks-arm64-node-1.26-v20230405
-* amazon-eks-arm64-node-1.25-v20230405
-* amazon-eks-arm64-node-1.24-v20230405
-* amazon-eks-arm64-node-1.23-v20230405
-* amazon-eks-arm64-node-1.22-v20230405
-* amazon-eks-node-1.26-v20230405
-* amazon-eks-node-1.25-v20230405
-* amazon-eks-node-1.24-v20230405
-* amazon-eks-node-1.23-v20230405
-* amazon-eks-node-1.22-v20230405
+### AMI Release v20230406
+* amazon-eks-gpu-node-1.26-v20230406
+* amazon-eks-gpu-node-1.25-v20230406
+* amazon-eks-gpu-node-1.24-v20230406
+* amazon-eks-gpu-node-1.23-v20230406
+* amazon-eks-gpu-node-1.22-v20230406
+* amazon-eks-arm64-node-1.26-v20230406
+* amazon-eks-arm64-node-1.25-v20230406
+* amazon-eks-arm64-node-1.24-v20230406
+* amazon-eks-arm64-node-1.23-v20230406
+* amazon-eks-arm64-node-1.22-v20230406
+* amazon-eks-node-1.26-v20230406
+* amazon-eks-node-1.25-v20230406
+* amazon-eks-node-1.24-v20230406
+* amazon-eks-node-1.23-v20230406
+* amazon-eks-node-1.22-v20230406
 
 [Release versions](https://docs.aws.amazon.com/eks/latest/userguide/eks-linux-ami-versions.html) for these AMIs:
-* `1.26.2-20230405`
-* `1.25.7-20230405`
-* `1.24.11-20230405`
-* `1.23.17-20230405`
-* `1.22.17-20230405`
+* `1.26.2-20230406`
+* `1.25.7-20230406`
+* `1.24.11-20230406`
+* `1.23.17-20230406`
+* `1.22.17-20230406`
 
 Binaries used to build these AMIs are published:
 * s3://amazon-eks/1.26.2/2023-03-17/