From 63f825bad5e328c9f117e80b4770f9f4a6cebd43 Mon Sep 17 00:00:00 2001 From: hhoover Date: Wed, 4 Oct 2023 13:38:55 -0500 Subject: [PATCH 1/3] coreos-overlay: Add support for new EKS versions This change adds download URLs for EKS 1.24, 1.25, 1.26, 1.27 and 1.28 so images can more easily be used for EKS workers. Signed-off-by: Hart Hoover --- ...3-10-04-eks-support-for-versions-above-1.23.md | 1 + .../flatcar-eks/files/download-kubelet.sh | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 changelog/bugfixes/2023-10-04-eks-support-for-versions-above-1.23.md diff --git a/changelog/bugfixes/2023-10-04-eks-support-for-versions-above-1.23.md b/changelog/bugfixes/2023-10-04-eks-support-for-versions-above-1.23.md new file mode 100644 index 0000000000..10362ab876 --- /dev/null +++ b/changelog/bugfixes/2023-10-04-eks-support-for-versions-above-1.23.md @@ -0,0 +1 @@ +- Added EKS support for versions 1.24-1.28. Fixed `/usr/share/amazon/eks/download-kubelet.sh` to include download paths for these versions. \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/flatcar-eks/files/download-kubelet.sh b/sdk_container/src/third_party/coreos-overlay/coreos-base/flatcar-eks/files/download-kubelet.sh index a5897dee69..f172439729 100755 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/flatcar-eks/files/download-kubelet.sh +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/flatcar-eks/files/download-kubelet.sh @@ -22,6 +22,21 @@ fi # Select the right path depending on the Kubernetes version. # https://github.com/awslabs/amazon-eks-ami/blob/master/Makefile case $CLUSTER_VERSION in + 1.28) + S3_PATH="1.28.1/2023-09-14" + ;; + 1.27) + S3_PATH="1.27.5/2023-09-14" + ;; + 1.26) + S3_PATH="1.26.8/2023-09-14" + ;; + 1.25) + S3_PATH="1.25.13/2023-09-14" + ;; + 1.24) + S3_PATH="1.24.17/2023-09-14" + ;; 1.23) S3_PATH="1.23.9/2022-07-27" ;; From d65aa949219a673d19215aba8d999fb5d2cc64dd Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Thu, 5 Oct 2023 09:55:55 +0200 Subject: [PATCH 2/3] changelog: Add link to PR for EKS version support Signed-off-by: Jeremi Piotrowski --- .../bugfixes/2023-10-04-eks-support-for-versions-above-1.23.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/bugfixes/2023-10-04-eks-support-for-versions-above-1.23.md b/changelog/bugfixes/2023-10-04-eks-support-for-versions-above-1.23.md index 10362ab876..1b870ae609 100644 --- a/changelog/bugfixes/2023-10-04-eks-support-for-versions-above-1.23.md +++ b/changelog/bugfixes/2023-10-04-eks-support-for-versions-above-1.23.md @@ -1 +1 @@ -- Added EKS support for versions 1.24-1.28. Fixed `/usr/share/amazon/eks/download-kubelet.sh` to include download paths for these versions. \ No newline at end of file +- Added AWS EKS support for versions 1.24-1.28. Fixed `/usr/share/amazon/eks/download-kubelet.sh` to include download paths for these versions. ([scripts#1210](https://github.com/flatcar/scripts/pull/1210)) From 1117a1d88f6f9412591e371f154eb00d2005c67f Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Thu, 5 Oct 2023 09:57:18 +0200 Subject: [PATCH 3/3] flatcar-eks: Bump ebuild revision This helps track which versions include certain changes because these ebuild revisions show up in the package version list that we publish alongside each release. Signed-off-by: Jeremi Piotrowski --- .../{flatcar-eks-0.0.1-r2.ebuild => flatcar-eks-0.0.1-r3.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/flatcar-eks/{flatcar-eks-0.0.1-r2.ebuild => flatcar-eks-0.0.1-r3.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/flatcar-eks/flatcar-eks-0.0.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/flatcar-eks/flatcar-eks-0.0.1-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/flatcar-eks/flatcar-eks-0.0.1-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/flatcar-eks/flatcar-eks-0.0.1-r3.ebuild