Skip to content

Commit b2a8617

Browse files
bryantbiggsbryantbiggs
authored
feat: Add support for newly released AL2023 accelerated AMI types (#3177)
1 parent eb78240 commit b2a8617

File tree

34 files changed

+58
-47
lines changed

34 files changed

+58
-47
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module "eks" {
3131
version = "~> 20.0"
3232
3333
cluster_name = "my-cluster"
34-
cluster_version = "1.30"
34+
cluster_version = "1.31"
3535
3636
cluster_endpoint_public_access = true
3737
@@ -175,15 +175,15 @@ We are grateful to the community for contributing bugfixes and improvements! Ple
175175
| Name | Version |
176176
|------|---------|
177177
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.2 |
178-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.61 |
178+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.70 |
179179
| <a name="requirement_time"></a> [time](#requirement\_time) | >= 0.9 |
180180
| <a name="requirement_tls"></a> [tls](#requirement\_tls) | >= 3.0 |
181181

182182
## Providers
183183

184184
| Name | Version |
185185
|------|---------|
186-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.61 |
186+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.70 |
187187
| <a name="provider_time"></a> [time](#provider\_time) | >= 0.9 |
188188
| <a name="provider_tls"></a> [tls](#provider\_tls) | >= 3.0 |
189189

‎docs/compute_resources.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Refer to the [Self Managed Node Group documentation](https://docs.aws.amazon.com
113113
1. The `self-managed-node-group` uses the latest AWS EKS Optimized AMI (Linux) for the given Kubernetes version by default:
114114

115115
```hcl
116-
cluster_version = "1.27"
116+
cluster_version = "1.31"
117117
118118
# This self managed node group will use the latest AWS EKS Optimized AMI for Kubernetes 1.27
119119
self_managed_node_groups = {
@@ -124,7 +124,7 @@ Refer to the [Self Managed Node Group documentation](https://docs.aws.amazon.com
124124
2. To use Bottlerocket, specify the `ami_type` as one of the respective `"BOTTLEROCKET_*" types` and supply a Bottlerocket OS AMI:
125125

126126
```hcl
127-
cluster_version = "1.27"
127+
cluster_version = "1.31"
128128
129129
self_managed_node_groups = {
130130
bottlerocket = {

‎examples/eks-managed-node-group/eks-al2.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module "eks_al2" {
33
version = "~> 20.0"
44

55
cluster_name = "${local.name}-al2"
6-
cluster_version = "1.30"
6+
cluster_version = "1.31"
77

88
# EKS Addons
99
cluster_addons = {

‎examples/eks-managed-node-group/eks-al2023.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module "eks_al2023" {
33
version = "~> 20.0"
44

55
cluster_name = "${local.name}-al2023"
6-
cluster_version = "1.30"
6+
cluster_version = "1.31"
77

88
# EKS Addons
99
cluster_addons = {

‎examples/eks-managed-node-group/eks-bottlerocket.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module "eks_bottlerocket" {
33
version = "~> 20.0"
44

55
cluster_name = "${local.name}-bottlerocket"
6-
cluster_version = "1.30"
6+
cluster_version = "1.31"
77

88
# EKS Addons
99
cluster_addons = {

‎examples/eks-managed-node-group/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.61"
7+
version = ">= 5.70"
88
}
99
}
1010
}

‎examples/karpenter/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,16 @@ Note that this example may create resources which cost money. Run `terraform des
8989
| Name | Version |
9090
|------|---------|
9191
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.2 |
92-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.61 |
92+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.70 |
9393
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 2.7 |
9494
| <a name="requirement_kubectl"></a> [kubectl](#requirement\_kubectl) | >= 2.0 |
9595

9696
## Providers
9797

9898
| Name | Version |
9999
|------|---------|
100-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.61 |
101-
| <a name="provider_aws.virginia"></a> [aws.virginia](#provider\_aws.virginia) | >= 5.61 |
100+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.70 |
101+
| <a name="provider_aws.virginia"></a> [aws.virginia](#provider\_aws.virginia) | >= 5.70 |
102102
| <a name="provider_helm"></a> [helm](#provider\_helm) | >= 2.7 |
103103
| <a name="provider_kubectl"></a> [kubectl](#provider\_kubectl) | >= 2.0 |
104104

‎examples/karpenter/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ module "eks" {
6262
source = "../.."
6363

6464
cluster_name = local.name
65-
cluster_version = "1.30"
65+
cluster_version = "1.31"
6666

6767
# Gives Terraform identity admin access to cluster which will
6868
# allow deploying resources (Karpenter) into the cluster
@@ -157,7 +157,7 @@ resource "helm_release" "karpenter" {
157157
repository_username = data.aws_ecrpublic_authorization_token.token.user_name
158158
repository_password = data.aws_ecrpublic_authorization_token.token.password
159159
chart = "karpenter"
160-
version = "1.0.0"
160+
version = "1.0.6"
161161
wait = false
162162

163163
values = [

‎examples/karpenter/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.61"
7+
version = ">= 5.70"
88
}
99
helm = {
1010
source = "hashicorp/helm"

‎examples/self-managed-node-group/eks-al2.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module "eks_al2" {
33
version = "~> 20.0"
44

55
cluster_name = "${local.name}-al2"
6-
cluster_version = "1.30"
6+
cluster_version = "1.31"
77

88
# EKS Addons
99
cluster_addons = {

‎examples/self-managed-node-group/eks-al2023.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module "eks_al2023" {
33
version = "~> 20.0"
44

55
cluster_name = "${local.name}-al2023"
6-
cluster_version = "1.30"
6+
cluster_version = "1.31"
77

88
# EKS Addons
99
cluster_addons = {

‎examples/self-managed-node-group/eks-bottlerocket.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module "eks_bottlerocket" {
33
version = "~> 20.0"
44

55
cluster_name = "${local.name}-bottlerocket"
6-
cluster_version = "1.30"
6+
cluster_version = "1.31"
77

88
# EKS Addons
99
cluster_addons = {

‎examples/self-managed-node-group/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.61"
7+
version = ">= 5.70"
88
}
99
}
1010
}

‎modules/_user_data/main.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ locals {
3030
WINDOWS_FULL_2022_x86_64 = "windows"
3131
AL2023_x86_64_STANDARD = "al2023"
3232
AL2023_ARM_64_STANDARD = "al2023"
33+
AL2023_x86_64_NEURON = "al2023"
34+
AL2023_x86_64_NVIDIA = "al2023"
3335
}
3436
# Try to use `ami_type` first, but fall back to current, default behavior
3537
# TODO - will be removed in v21.0

‎modules/eks-managed-node-group/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module "eks_managed_node_group" {
1010
1111
name = "separate-eks-mng"
1212
cluster_name = "my-cluster"
13-
cluster_version = "1.27"
13+
cluster_version = "1.31"
1414
1515
subnet_ids = ["subnet-abcde012", "subnet-bcde012a", "subnet-fghi345a"]
1616
@@ -64,13 +64,13 @@ module "eks_managed_node_group" {
6464
| Name | Version |
6565
|------|---------|
6666
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.2 |
67-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.61 |
67+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.70 |
6868

6969
## Providers
7070

7171
| Name | Version |
7272
|------|---------|
73-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.61 |
73+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.70 |
7474

7575
## Modules
7676

‎modules/eks-managed-node-group/main.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,8 @@ locals {
362362
WINDOWS_FULL_2022_x86_64 = "/aws/service/ami-windows-latest/Windows_Server-2022-English-Core-EKS_Optimized-${local.ssm_cluster_version}"
363363
AL2023_x86_64_STANDARD = "/aws/service/eks/optimized-ami/${local.ssm_cluster_version}/amazon-linux-2023/x86_64/standard/recommended/release_version"
364364
AL2023_ARM_64_STANDARD = "/aws/service/eks/optimized-ami/${local.ssm_cluster_version}/amazon-linux-2023/arm64/standard/recommended/release_version"
365+
AL2023_x86_64_NEURON = "/aws/service/eks/optimized-ami/${local.ssm_cluster_version}/amazon-linux-2023/x86_64/neuron/recommended/release_version"
366+
AL2023_x86_64_NVIDIA = "/aws/service/eks/optimized-ami/${local.ssm_cluster_version}/amazon-linux-2023/x86_64/nvidia/recommended/release_version"
365367
}
366368

367369
# The Windows SSM params currently do not have a release version, so we have to get the full output JSON blob and parse out the release version

‎modules/eks-managed-node-group/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.61"
7+
version = ">= 5.70"
88
}
99
}
1010
}

‎modules/fargate-profile/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ module "fargate_profile" {
2929
| Name | Version |
3030
|------|---------|
3131
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.2 |
32-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.61 |
32+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.70 |
3333

3434
## Providers
3535

3636
| Name | Version |
3737
|------|---------|
38-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.61 |
38+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.70 |
3939

4040
## Modules
4141

‎modules/fargate-profile/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.61"
7+
version = ">= 5.70"
88
}
99
}
1010
}

‎modules/karpenter/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@ module "karpenter" {
8686
| Name | Version |
8787
|------|---------|
8888
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.2 |
89-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.61 |
89+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.70 |
9090

9191
## Providers
9292

9393
| Name | Version |
9494
|------|---------|
95-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.61 |
95+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.70 |
9696

9797
## Modules
9898

‎modules/karpenter/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.61"
7+
version = ">= 5.70"
88
}
99
}
1010
}

‎modules/self-managed-node-group/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module "self_managed_node_group" {
1010
1111
name = "separate-self-mng"
1212
cluster_name = "my-cluster"
13-
cluster_version = "1.27"
13+
cluster_version = "1.31"
1414
cluster_endpoint = "https://012345678903AB2BAE5D1E0BFE0E2B50.gr7.us-east-1.eks.amazonaws.com"
1515
cluster_auth_base64 = "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM1ekNDQWMrZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKbXFqQ1VqNGdGR2w3ZW5PeWthWnZ2RjROOTVOUEZCM2o0cGhVZUsrWGFtN2ZSQnZya0d6OGxKZmZEZWF2b2plTwpQK2xOZFlqdHZncmxCUEpYdHZIZmFzTzYxVzdIZmdWQ2EvamdRM2w3RmkvL1dpQmxFOG9oWUZkdWpjc0s1SXM2CnNkbk5KTTNYUWN2TysrSitkV09NT2ZlNzlsSWdncmdQLzgvRU9CYkw3eUY1aU1hS3lsb1RHL1V3TlhPUWt3ZUcKblBNcjdiUmdkQ1NCZTlXYXowOGdGRmlxV2FOditsTDhsODBTdFZLcWVNVlUxbjQyejVwOVpQRTd4T2l6L0xTNQpYV2lXWkVkT3pMN0xBWGVCS2gzdkhnczFxMkI2d1BKZnZnS1NzWllQRGFpZTloT1NNOUJkNFNPY3JrZTRYSVBOCkVvcXVhMlYrUDRlTWJEQzhMUkVWRDdCdVZDdWdMTldWOTBoL3VJUy9WU2VOcEdUOGVScE5DakszSjc2aFlsWm8KWjNGRG5QWUY0MWpWTHhiOXF0U1ROdEp6amYwWXBEYnFWci9xZzNmQWlxbVorMzd3YWM1eHlqMDZ4cmlaRUgzZgpUM002d2lCUEVHYVlGeWN5TmNYTk5aYW9DWDJVL0N1d2JsUHAKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQ=="
1616
@@ -43,13 +43,13 @@ module "self_managed_node_group" {
4343
| Name | Version |
4444
|------|---------|
4545
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.2 |
46-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.61 |
46+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.70 |
4747

4848
## Providers
4949

5050
| Name | Version |
5151
|------|---------|
52-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.61 |
52+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.70 |
5353

5454
## Modules
5555

‎modules/self-managed-node-group/main.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ locals {
2424
WINDOWS_FULL_2022_x86_64 = "windows"
2525
AL2023_x86_64_STANDARD = "al2023"
2626
AL2023_ARM_64_STANDARD = "al2023"
27+
AL2023_x86_64_NEURON = "al2023"
28+
AL2023_x86_64_NVIDIA = "al2023"
2729
}
2830

2931
user_data_type = local.ami_type_to_user_data_type[var.ami_type]
@@ -43,6 +45,8 @@ locals {
4345
WINDOWS_FULL_2022_x86_64 = "/aws/service/ami-windows-latest/Windows_Server-2022-English-Core-EKS_Optimized-${local.ssm_cluster_version}/image_id"
4446
AL2023_x86_64_STANDARD = "/aws/service/eks/optimized-ami/${local.ssm_cluster_version}/amazon-linux-2023/x86_64/standard/recommended/image_id"
4547
AL2023_ARM_64_STANDARD = "/aws/service/eks/optimized-ami/${local.ssm_cluster_version}/amazon-linux-2023/arm64/standard/recommended/image_id"
48+
AL2023_x86_64_NEURON = "/aws/service/eks/optimized-ami/${local.ssm_cluster_version}/amazon-linux-2023/x86_64/neuron/recommended/image_id"
49+
AL2023_x86_64_NVIDIA = "/aws/service/eks/optimized-ami/${local.ssm_cluster_version}/amazon-linux-2023/x86_64/nvidia/recommended/image_id"
4650
}
4751
}
4852

‎modules/self-managed-node-group/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.61"
7+
version = ">= 5.70"
88
}
99
}
1010
}

‎tests/eks-managed-node-group/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ Note that this example may create resources which cost money. Run `terraform des
1818
| Name | Version |
1919
|------|---------|
2020
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.2 |
21-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.61 |
21+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.70 |
2222

2323
## Providers
2424

2525
| Name | Version |
2626
|------|---------|
27-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.61 |
27+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.70 |
2828

2929
## Modules
3030

‎tests/eks-managed-node-group/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ data "aws_availability_zones" "available" {}
77

88
locals {
99
name = "ex-${replace(basename(path.cwd), "_", "-")}"
10-
cluster_version = "1.30"
10+
cluster_version = "1.31"
1111
region = "eu-west-1"
1212

1313
vpc_cidr = "10.0.0.0/16"

‎tests/eks-managed-node-group/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.61"
7+
version = ">= 5.70"
88
}
99
}
1010
}

‎tests/fargate-profile/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ Note that this example may create resources which cost money. Run `terraform des
1818
| Name | Version |
1919
|------|---------|
2020
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.2 |
21-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.61 |
21+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.70 |
2222

2323
## Providers
2424

2525
| Name | Version |
2626
|------|---------|
27-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.61 |
27+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.70 |
2828

2929
## Modules
3030

‎tests/fargate-profile/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ data "aws_availability_zones" "available" {}
66

77
locals {
88
name = "ex-${basename(path.cwd)}"
9-
cluster_version = "1.30"
9+
cluster_version = "1.31"
1010
region = "eu-west-1"
1111

1212
vpc_cidr = "10.0.0.0/16"

‎tests/fargate-profile/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.61"
7+
version = ">= 5.70"
88
}
99
}
1010
}

0 commit comments

Comments
 (0)