Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make EKS 1.30 the default #7827

Merged
merged 2 commits into from
Jun 11, 2024
Merged

Make EKS 1.30 the default #7827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f9e0eb
Make EKS 1.30 the default
cPu1 Jun 11, 2024
d4d12aa
Fix tests
cPu1 Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/apis/eksctl.io/v1alpha5/assets/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 3 additions & 1 deletion pkg/apis/eksctl.io/v1alpha5/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions pkg/apis/eksctl.io/v1alpha5/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions pkg/cfn/builder/managed_nodegroup_ami_type_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion pkg/cfn/builder/testdata/launch_template/launch_template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion pkg/cfn/builder/testdata/launch_template/launch_template_additional_volumes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"ManagedNodeGroup": {
"Type": "AWS::EKS::Nodegroup",
"Properties": {
"AmiType": "AL2_x86_64",
"AmiType": "AL2023_x86_64_STANDARD",
"ClusterName": "lt",
"InstanceTypes": [
"m5.large"
Expand Down
2 changes: 1 addition & 1 deletion ...cfn/builder/testdata/launch_template/launch_template_additional_volumes_missing_size.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"ManagedNodeGroup": {
"Type": "AWS::EKS::Nodegroup",
"Properties": {
"AmiType": "AL2_x86_64",
"AmiType": "AL2023_x86_64_STANDARD",
"ClusterName": "lt",
"InstanceTypes": [
"m5.large"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cfn/builder/testdata/launch_template/placement.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion pkg/cfn/builder/testdata/launch_template/spot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"ManagedNodeGroup": {
"Type": "AWS::EKS::Nodegroup",
"Properties": {
"AmiType": "AL2_x86_64",
"AmiType": "AL2023_x86_64_STANDARD",
"ClusterName": "lt",
"CapacityType": "SPOT",
"Labels": {
Expand Down
2 changes: 1 addition & 1 deletion pkg/cfn/builder/testdata/launch_template/ssh_disabled.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion pkg/cfn/builder/testdata/launch_template/ssh_enabled.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion pkg/cfn/builder/testdata/launch_template/standard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion pkg/ctl/cmdutils/filter/nodegroup_filter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ const expected = `
"metadata": {
"name": "test-3x3-ngs",
"region": "eu-central-1",
"version": "1.29"
"version": "1.30"
},
"kubernetesNetworkConfig": {
"ipFamily": "IPv4"
Expand Down
4 changes: 2 additions & 2 deletions userdocs/src/getting-started.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
Loading