- New for {{ build_date_utc.strftime('%Y') }}
+ Check out latest eksctl features
+ Support for AMIs based on AmazonLinux2023
Configuring cluster access management via AWS EKS Access Entries.
Configuring fine-grained permissions to EKS running apps via EKS Pod Identity Associations.
Creating fully private clusters on AWS Outposts.
From de74c5bafe288a30d090d9fc22672a195b0b4b70 Mon Sep 17 00:00:00 2001
From: Tibi <110664232+TiberiuGC@users.noreply.github.com>
Date: Thu, 28 Mar 2024 19:38:39 +0200
Subject: [PATCH 09/11] add validation error for maxpods limitation
---
pkg/apis/eksctl.io/v1alpha5/validation.go | 4 ++++
pkg/apis/eksctl.io/v1alpha5/validation_test.go | 10 ++++++++++
2 files changed, 14 insertions(+)
diff --git a/pkg/apis/eksctl.io/v1alpha5/validation.go b/pkg/apis/eksctl.io/v1alpha5/validation.go
index a296abcb10..b49144ba7a 100644
--- a/pkg/apis/eksctl.io/v1alpha5/validation.go
+++ b/pkg/apis/eksctl.io/v1alpha5/validation.go
@@ -1187,6 +1187,10 @@ func ValidateManagedNodeGroup(index int, ng *ManagedNodeGroup) error {
}
}
+ if ng.AMIFamily == NodeImageFamilyAmazonLinux2023 && ng.MaxPodsPerNode > 0 {
+ return errors.Errorf("eksctl does not support configuring maxPodsPerNode EKS-managed nodes based on %s", NodeImageFamilyAmazonLinux2023)
+ }
+
if ng.AMIFamily == NodeImageFamilyBottlerocket {
fieldNotSupported := func(field string) error {
return &unsupportedFieldError{
diff --git a/pkg/apis/eksctl.io/v1alpha5/validation_test.go b/pkg/apis/eksctl.io/v1alpha5/validation_test.go
index 45eea4fa7f..cecec152d1 100644
--- a/pkg/apis/eksctl.io/v1alpha5/validation_test.go
+++ b/pkg/apis/eksctl.io/v1alpha5/validation_test.go
@@ -2092,6 +2092,16 @@ var _ = Describe("ClusterConfig validation", func() {
})
})
+ Describe("AmazonLinux2023 node groups", func() {
+ It("returns an error when setting maxPodsPerNode for managed nodegroups", func() {
+ ng := api.NewManagedNodeGroup()
+ ng.AMIFamily = api.NodeImageFamilyAmazonLinux2023
+ ng.MaxPodsPerNode = 5
+ err := api.ValidateManagedNodeGroup(0, ng)
+ Expect(err).To(MatchError(ContainSubstring("eksctl does not support configuring maxPodsPerNode EKS-managed nodes")))
+ })
+ })
+
Describe("Windows node groups", func() {
It("returns an error with unsupported fields", func() {
doc := api.InlineDocument{
From 0f3f294082f87cc82c211151ce02a2bd6bf133d0 Mon Sep 17 00:00:00 2001
From: Tibi <110664232+TiberiuGC@users.noreply.github.com>
Date: Fri, 29 Mar 2024 14:43:31 +0200
Subject: [PATCH 10/11] add integration tests for al2023
---
.../tests/custom_ami/custom_ami_test.go | 33 +++++++++++++++++--
.../tests/custom_ami/testdata/al2023.yaml | 19 +++++++++++
.../tests/managed/managed_nodegroup_test.go | 27 +++++++++++++++
3 files changed, 77 insertions(+), 2 deletions(-)
create mode 100644 integration/tests/custom_ami/testdata/al2023.yaml
diff --git a/integration/tests/custom_ami/custom_ami_test.go b/integration/tests/custom_ami/custom_ami_test.go
index 05d6125af3..c51e605895 100644
--- a/integration/tests/custom_ami/custom_ami_test.go
+++ b/integration/tests/custom_ami/custom_ami_test.go
@@ -38,6 +38,7 @@ func TestOverrideBootstrap(t *testing.T) {
var (
customAMIAL2 string
+ customAMIAL2023 string
customAMIBottlerocket string
)
@@ -47,15 +48,23 @@ var _ = BeforeSuite(func() {
// retrieve AL2 AMI
input := &awsssm.GetParameterInput{
- Name: aws.String("/aws/service/eks/optimized-ami/1.22/amazon-linux-2/recommended/image_id"),
+ Name: aws.String(fmt.Sprintf("/aws/service/eks/optimized-ami/%s/amazon-linux-2/recommended/image_id", params.Version)),
}
output, err := ssm.GetParameter(context.Background(), input)
Expect(err).NotTo(HaveOccurred())
customAMIAL2 = *output.Parameter.Value
+ // retrieve AL2023 AMI
+ input = &awsssm.GetParameterInput{
+ Name: aws.String(fmt.Sprintf("/aws/service/eks/optimized-ami/%s/amazon-linux-2023/x86_64/standard/recommended/image_id", params.Version)),
+ }
+ output, err = ssm.GetParameter(context.Background(), input)
+ Expect(err).NotTo(HaveOccurred())
+ customAMIAL2023 = *output.Parameter.Value
+
// retrieve Bottlerocket AMI
input = &awsssm.GetParameterInput{
- Name: aws.String("/aws/service/bottlerocket/aws-k8s-1.25/x86_64/latest/image_id"),
+ Name: aws.String(fmt.Sprintf("/aws/service/bottlerocket/aws-k8s-%s/x86_64/latest/image_id", params.Version)),
}
output, err = ssm.GetParameter(context.Background(), input)
Expect(err).NotTo(HaveOccurred())
@@ -75,6 +84,26 @@ var _ = BeforeSuite(func() {
var _ = Describe("(Integration) [Test Custom AMI]", func() {
params.LogStacksEventsOnFailure()
+ Context("al2023 managed and un-managed nodegroups", func() {
+ It("can create working nodegroups which can join the cluster", func() {
+ By(fmt.Sprintf("using the following EKS optimised AMI: %s", customAMIAL2023))
+ content, err := os.ReadFile(filepath.Join("testdata/al2023.yaml"))
+ Expect(err).NotTo(HaveOccurred())
+ content = bytes.ReplaceAll(content, []byte(""), []byte(params.ClusterName))
+ content = bytes.ReplaceAll(content, []byte(""), []byte(params.Region))
+ content = bytes.ReplaceAll(content, []byte(""), []byte(customAMIAL2023))
+ cmd := params.EksctlCreateCmd.
+ WithArgs(
+ "nodegroup",
+ "--config-file", "-",
+ "--verbose", "4",
+ ).
+ WithoutArg("--region", params.Region).
+ WithStdin(bytes.NewReader(content))
+ Expect(cmd).To(RunSuccessfully())
+ })
+ })
+
Context("override bootstrap command for managed and un-managed nodegroups", func() {
It("can create a working nodegroup which can join the cluster", func() {
diff --git a/integration/tests/custom_ami/testdata/al2023.yaml b/integration/tests/custom_ami/testdata/al2023.yaml
new file mode 100644
index 0000000000..57f6738e63
--- /dev/null
+++ b/integration/tests/custom_ami/testdata/al2023.yaml
@@ -0,0 +1,19 @@
+apiVersion: eksctl.io/v1alpha5
+kind: ClusterConfig
+
+# name is generated
+metadata:
+ name:
+ region:
+
+nodeGroups:
+ - name: unm-al2023
+ ami:
+ amiFamily: AmazonLinux2023
+ desiredCapacity: 1
+
+managedNodeGroups:
+ - name: mng-al2023
+ ami:
+ amiFamily: AmazonLinux2023
+ desiredCapacity: 1
diff --git a/integration/tests/managed/managed_nodegroup_test.go b/integration/tests/managed/managed_nodegroup_test.go
index e4588875ad..a65a628194 100644
--- a/integration/tests/managed/managed_nodegroup_test.go
+++ b/integration/tests/managed/managed_nodegroup_test.go
@@ -70,6 +70,7 @@ var _ = Describe("(Integration) Create Managed Nodegroups", func() {
const (
updateConfigNodegroup = "ng-update-config"
+ al2023Nodegroup = "ng-al2023"
bottlerocketNodegroup = "ng-bottlerocket"
bottlerocketGPUNodegroup = "ng-bottlerocket-gpu"
ubuntuNodegroup = "ng-ubuntu"
@@ -302,6 +303,32 @@ var _ = Describe("(Integration) Create Managed Nodegroups", func() {
checkNg(bottlerocketGPUNodegroup)
})
+ It("supports AmazonLinux2023 nodegroups", func() {
+ clusterConfig := makeClusterConfig()
+ clusterConfig.ManagedNodeGroups = []*api.ManagedNodeGroup{
+ {
+ NodeGroupBase: &api.NodeGroupBase{
+ Name: al2023Nodegroup,
+ AMIFamily: "AmazonLinux2023",
+ },
+ },
+ }
+
+ By("creating it")
+ Expect(params.EksctlCreateCmd.
+ WithArgs(
+ "nodegroup",
+ "--config-file", "-",
+ "--verbose", "4",
+ ).
+ WithoutArg("--region", params.Region).
+ WithStdin(clusterutils.Reader(clusterConfig))).
+ To(RunSuccessfully())
+
+ By("ensuring it is healthy")
+ checkNg(al2023Nodegroup)
+ })
+
It("supports bottlerocket and ubuntu nodegroups with additional volumes", func() {
clusterConfig := makeClusterConfig()
clusterConfig.ManagedNodeGroups = []*api.ManagedNodeGroup{
From 8965847e273bcac4ac2044707e784fb20ad57007 Mon Sep 17 00:00:00 2001
From: Tibi <110664232+TiberiuGC@users.noreply.github.com>
Date: Tue, 2 Apr 2024 08:06:50 +0300
Subject: [PATCH 11/11] improve validation message
---
pkg/apis/eksctl.io/v1alpha5/validation.go | 19 +++++++++++++++++--
.../eksctl.io/v1alpha5/validation_test.go | 4 ++--
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/pkg/apis/eksctl.io/v1alpha5/validation.go b/pkg/apis/eksctl.io/v1alpha5/validation.go
index b49144ba7a..0b3b0000f3 100644
--- a/pkg/apis/eksctl.io/v1alpha5/validation.go
+++ b/pkg/apis/eksctl.io/v1alpha5/validation.go
@@ -62,6 +62,11 @@ var (
}
)
+var (
+ SupportedAmazonLinuxImages = supportedAMIFamiliesForOS(IsAmazonLinuxImage)
+ SupportedUbuntuImages = supportedAMIFamiliesForOS(IsUbuntuImage)
+)
+
// NOTE: we don't use k8s.io/apimachinery/pkg/util/sets here to keep API package free of dependencies
type nameSet map[string]struct{}
@@ -1267,8 +1272,8 @@ func ValidateManagedNodeGroup(index int, ng *ManagedNodeGroup) error {
return errors.Errorf("when using a custom AMI, amiFamily needs to be explicitly set via config file or via --node-ami-family flag")
}
if !IsAmazonLinuxImage(ng.AMIFamily) && !IsUbuntuImage(ng.AMIFamily) {
- return errors.Errorf("cannot set amiFamily to %s when using a custom AMI for managed nodes, only %s, %s, %s, %s and %s are supported", ng.AMIFamily,
- NodeImageFamilyAmazonLinux2023, NodeImageFamilyAmazonLinux2, NodeImageFamilyUbuntu1804, NodeImageFamilyUbuntu2004, NodeImageFamilyUbuntu2204)
+ return errors.Errorf("cannot set amiFamily to %s when using a custom AMI for managed nodes, only %s are supported", ng.AMIFamily,
+ strings.Join(append(SupportedAmazonLinuxImages, SupportedUbuntuImages...), ", "))
}
if ng.OverrideBootstrapCommand == nil && ng.AMIFamily != NodeImageFamilyAmazonLinux2023 {
return errors.Errorf("%[1]s.overrideBootstrapCommand is required when using a custom AMI based on %s (%[1]s.ami)", path, ng.AMIFamily)
@@ -1475,6 +1480,16 @@ func isSupportedAMIFamily(imageFamily string) bool {
return false
}
+func supportedAMIFamiliesForOS(isOSImage func(string) bool) []string {
+ amiFamilies := []string{}
+ for _, image := range SupportedAMIFamilies() {
+ if isOSImage(image) {
+ amiFamilies = append(amiFamilies, image)
+ }
+ }
+ return amiFamilies
+}
+
func IsAmazonLinuxImage(imageFamily string) bool {
switch imageFamily {
case NodeImageFamilyAmazonLinux2023,
diff --git a/pkg/apis/eksctl.io/v1alpha5/validation_test.go b/pkg/apis/eksctl.io/v1alpha5/validation_test.go
index cecec152d1..6f76855032 100644
--- a/pkg/apis/eksctl.io/v1alpha5/validation_test.go
+++ b/pkg/apis/eksctl.io/v1alpha5/validation_test.go
@@ -2070,8 +2070,8 @@ var _ = Describe("ClusterConfig validation", func() {
mng.AMIFamily = api.NodeImageFamilyBottlerocket
mng.OverrideBootstrapCommand = nil
err = api.ValidateManagedNodeGroup(0, mng)
- errorMsg := fmt.Sprintf("cannot set amiFamily to %s when using a custom AMI for managed nodes, only %s, %s, %s, %s and %s are supported",
- mng.AMIFamily, api.NodeImageFamilyAmazonLinux2023, api.NodeImageFamilyAmazonLinux2, api.NodeImageFamilyUbuntu1804, api.NodeImageFamilyUbuntu2004, api.NodeImageFamilyUbuntu2204)
+ errorMsg := fmt.Sprintf("cannot set amiFamily to %s when using a custom AMI for managed nodes, only %s are supported", mng.AMIFamily,
+ strings.Join(append(api.SupportedAmazonLinuxImages, api.SupportedUbuntuImages...), ", "))
Expect(err).To(MatchError(errorMsg))
mng.AMIFamily = api.NodeImageFamilyAmazonLinux2023
