Merge pull request #7827 from cPu1/eks-1.30-default

Make EKS 1.30 the default
eksctl-io · Jun 11, 2024 · 17a507a · 17a507a
2 parents dca6eed + d4d12aa
commit 17a507a
Show file tree

Hide file tree

Showing 15 changed files with 100 additions and 99 deletions.
diff --git a/pkg/apis/eksctl.io/v1alpha5/assets/schema.json b/pkg/apis/eksctl.io/v1alpha5/assets/schema.json
@@ -769,9 +769,9 @@
         },
         "version": {
           "type": "string",
-          "description": "Valid variants are: `\"1.23\"`, `\"1.24\"`, `\"1.25\"`, `\"1.26\"`, `\"1.27\"`, `\"1.28\"`, `\"1.29\"` (default), `\"1.30\"` represents Kubernetes version 1.30.x..",
-          "x-intellij-html-description": "Valid variants are: <code>&quot;1.23&quot;</code>, <code>&quot;1.24&quot;</code>, <code>&quot;1.25&quot;</code>, <code>&quot;1.26&quot;</code>, <code>&quot;1.27&quot;</code>, <code>&quot;1.28&quot;</code>, <code>&quot;1.29&quot;</code> (default), <code>&quot;1.30&quot;</code> represents Kubernetes version 1.30.x..",
-          "default": "1.29",
+          "description": "Valid variants are: `\"1.23\"`, `\"1.24\"`, `\"1.25\"`, `\"1.26\"`, `\"1.27\"`, `\"1.28\"`, `\"1.29\"`, `\"1.30\"` (default).",
+          "x-intellij-html-description": "Valid variants are: <code>&quot;1.23&quot;</code>, <code>&quot;1.24&quot;</code>, <code>&quot;1.25&quot;</code>, <code>&quot;1.26&quot;</code>, <code>&quot;1.27&quot;</code>, <code>&quot;1.28&quot;</code>, <code>&quot;1.29&quot;</code>, <code>&quot;1.30&quot;</code> (default).",
+          "default": "1.30",
           "enum": [
             "1.23",
             "1.24",

diff --git a/pkg/apis/eksctl.io/v1alpha5/defaults.go b/pkg/apis/eksctl.io/v1alpha5/defaults.go
@@ -10,6 +10,7 @@ import (
 	ekstypes "github.com/aws/aws-sdk-go-v2/service/eks/types"
 
 	"github.com/weaveworks/eksctl/pkg/utils"
+	instanceutils "github.com/weaveworks/eksctl/pkg/utils/instance"
 )
 
 const (
@@ -134,7 +135,8 @@ func SetManagedNodeGroupDefaults(ng *ManagedNodeGroup, meta *ClusterMeta, contro
 	// When using custom AMIs, we want the user to explicitly specify AMI family.
 	// Thus, we only set up default AMI family when no custom AMI is being used.
 	if ng.AMIFamily == "" && ng.AMI == "" {
-		if isMinVer, _ := utils.IsMinVersion(Version1_30, meta.Version); isMinVer {
+		if isMinVer, _ := utils.IsMinVersion(Version1_30, meta.Version); isMinVer && !instanceutils.IsGPUInstanceType(ng.InstanceType) &&
+			!instanceutils.IsARMGPUInstanceType(ng.InstanceType) {
 			ng.AMIFamily = NodeImageFamilyAmazonLinux2023
 		} else {
 			ng.AMIFamily = NodeImageFamilyAmazonLinux2

diff --git a/pkg/apis/eksctl.io/v1alpha5/types.go b/pkg/apis/eksctl.io/v1alpha5/types.go
@@ -43,11 +43,10 @@ const (
 
 	Version1_29 = "1.29"
 
-	// Version1_30 represents Kubernetes version 1.30.x.
 	Version1_30 = "1.30"
 
 	// DefaultVersion (default)
-	DefaultVersion = Version1_29
+	DefaultVersion = Version1_30
 
 	LatestVersion = Version1_30
 

diff --git a/pkg/cfn/builder/managed_nodegroup_ami_type_test.go b/pkg/cfn/builder/managed_nodegroup_ami_type_test.go
@@ -64,7 +64,7 @@ var _ = DescribeTable("Managed Nodegroup AMI type", func(e amiTypeEntry) {
 				Name: "test",
 			},
 		},
-		expectedAMIType: "AL2_x86_64",
+		expectedAMIType: "AL2023_x86_64_STANDARD",
 	}),
 
 	Entry("AL2 AMI type", amiTypeEntry{
@@ -83,7 +83,7 @@ var _ = DescribeTable("Managed Nodegroup AMI type", func(e amiTypeEntry) {
 				Name: "test",
 			},
 		},
-		expectedAMIType: "AL2_x86_64",
+		expectedAMIType: "AL2023_x86_64_STANDARD",
 	}),
 
 	Entry("default GPU instance type", amiTypeEntry{

diff --git a/pkg/cfn/builder/testdata/launch_template/launch_template.json b/pkg/cfn/builder/testdata/launch_template/launch_template.json
@@ -2,7 +2,7 @@
     "ManagedNodeGroup": {
         "Type": "AWS::EKS::Nodegroup",
         "Properties": {
-            "AmiType": "AL2_x86_64",
+            "AmiType": "AL2023_x86_64_STANDARD",
             "ClusterName": "lt",
             "Labels": {
                 "alpha.eksctl.io/cluster-name": "lt",

diff --git a/pkg/cfn/builder/testdata/launch_template/launch_template_additional_volumes.json b/pkg/cfn/builder/testdata/launch_template/launch_template_additional_volumes.json
@@ -96,7 +96,7 @@
   "ManagedNodeGroup": {
     "Type": "AWS::EKS::Nodegroup",
     "Properties": {
-      "AmiType": "AL2_x86_64",
+      "AmiType": "AL2023_x86_64_STANDARD",
       "ClusterName": "lt",
       "InstanceTypes": [
         "m5.large"

diff --git a/...cfn/builder/testdata/launch_template/launch_template_additional_volumes_missing_size.json b/...cfn/builder/testdata/launch_template/launch_template_additional_volumes_missing_size.json
@@ -95,7 +95,7 @@
   "ManagedNodeGroup": {
     "Type": "AWS::EKS::Nodegroup",
     "Properties": {
-      "AmiType": "AL2_x86_64",
+      "AmiType": "AL2023_x86_64_STANDARD",
       "ClusterName": "lt",
       "InstanceTypes": [
         "m5.large"

diff --git a/pkg/cfn/builder/testdata/launch_template/placement.json b/pkg/cfn/builder/testdata/launch_template/placement.json
@@ -88,7 +88,7 @@
     "ManagedNodeGroup": {
         "Type": "AWS::EKS::Nodegroup",
         "Properties": {
-            "AmiType": "AL2_x86_64",
+            "AmiType": "AL2023_x86_64_STANDARD",
             "ClusterName": "lt",
             "Labels": {
                 "alpha.eksctl.io/cluster-name": "lt",

diff --git a/pkg/cfn/builder/testdata/launch_template/spot.json b/pkg/cfn/builder/testdata/launch_template/spot.json
@@ -85,7 +85,7 @@
     "ManagedNodeGroup": {
         "Type": "AWS::EKS::Nodegroup",
         "Properties": {
-            "AmiType": "AL2_x86_64",
+            "AmiType": "AL2023_x86_64_STANDARD",
             "ClusterName": "lt",
             "CapacityType": "SPOT",
             "Labels": {

diff --git a/pkg/cfn/builder/testdata/launch_template/ssh_disabled.json b/pkg/cfn/builder/testdata/launch_template/ssh_disabled.json
@@ -87,7 +87,7 @@
   "ManagedNodeGroup": {
     "Type": "AWS::EKS::Nodegroup",
     "Properties": {
-      "AmiType": "AL2_x86_64",
+      "AmiType": "AL2023_x86_64_STANDARD",
       "ClusterName": "lt",
       "Labels": {
         "alpha.eksctl.io/cluster-name": "lt",

diff --git a/pkg/cfn/builder/testdata/launch_template/ssh_enabled.json b/pkg/cfn/builder/testdata/launch_template/ssh_enabled.json
@@ -90,7 +90,7 @@
     "ManagedNodeGroup": {
         "Type": "AWS::EKS::Nodegroup",
         "Properties": {
-            "AmiType": "AL2_x86_64",
+            "AmiType": "AL2023_x86_64_STANDARD",
             "ClusterName": "lt",
             "Labels": {
                 "alpha.eksctl.io/cluster-name": "lt",

diff --git a/pkg/cfn/builder/testdata/launch_template/standard.json b/pkg/cfn/builder/testdata/launch_template/standard.json
@@ -85,7 +85,7 @@
     "ManagedNodeGroup": {
         "Type": "AWS::EKS::Nodegroup",
         "Properties": {
-            "AmiType": "AL2_x86_64",
+            "AmiType": "AL2023_x86_64_STANDARD",
             "ClusterName": "lt",
             "Labels": {
                 "alpha.eksctl.io/cluster-name": "lt",

diff --git a/pkg/ctl/cmdutils/filter/nodegroup_filter_test.go b/pkg/ctl/cmdutils/filter/nodegroup_filter_test.go
@@ -346,7 +346,7 @@ const expected = `
 		"metadata": {
 		  "name": "test-3x3-ngs",
 		  "region": "eu-central-1",
-		  "version": "1.29"
+		  "version": "1.30"
 		},
 		"kubernetesNetworkConfig": {
         	"ipFamily": "IPv4"

diff --git a/userdocs/src/getting-started.md b/userdocs/src/getting-started.md
@@ -2,7 +2,7 @@
 
 !!! tip "New for 2024"
     EKS Add-ons now support receiving IAM permissions via [EKS Pod Identity Associations](/usage/pod-identity-associations/#eks-add-ons-support-for-pod-identity-associations)
-    
+
     `eksctl` now supports AMIs based on AmazonLinux2023
 
 !!! tip "eksctl main features in 2023"
@@ -122,7 +122,7 @@ eksctl create cluster --name=cluster-1 --nodes=4
 
 ### Supported versions
 
-EKS supports versions `1.23` (extended), `1.24` (extended), `1.25`, `1.26`, `1.27`, `1.28`, **`1.29`** (default) and `1.30`.
+EKS supports versions `1.23` (extended), `1.24` (extended), `1.25`, `1.26`, `1.27`, `1.28`, `1.29` and **`1.30`** (default).
 With `eksctl` you can deploy any of the supported versions by passing `--version`.
 
 ```sh