Skip to content

Commit d63958d

Browse files
committed
feat(eks-official-image): support aws v6
1 parent ebf6e32 commit d63958d

File tree

5 files changed

+21
-5
lines changed

5 files changed

+21
-5
lines changed

modules/eks-official-image/README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ This module creates following resources.
77

88
| Name | Version |
99
|------|---------|
10-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.6 |
11-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.42 |
10+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.12 |
11+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.12 |
1212

1313
## Providers
1414

1515
| Name | Version |
1616
|------|---------|
17-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.50.0 |
17+
| <a name="provider_aws"></a> [aws](#provider\_aws) | 6.21.0 |
1818

1919
## Modules
2020

@@ -33,6 +33,7 @@ No modules.
3333
| <a name="input_kubernetes_version"></a> [kubernetes\_version](#input\_kubernetes\_version) | (Required) Desired Kubernetes version to search the official EKS AMIs for the EKS cluster. | `string` | n/a | yes |
3434
| <a name="input_os"></a> [os](#input\_os) | (Required) A configuration of OS (Operating System) to search EKS official AMIs. `os` block as defined below.<br/> (Required) `name` - A name of the OS (Operating System). Valid values are `amazon-linux`, `ubuntu`, `ubuntu-pro`.<br/> (Required) `release` - A release name of the OS.<br/> `amazon-linux` - Valid values are `2`, `2023`.<br/> `ubuntu` - Valid values are `18.04`, `20.04`, `22.04`, `24.04`, `26.04`.<br/> `ubuntu-pro` - Same with `ubuntu`. | <pre>object({<br/> name = string<br/> release = string<br/> })</pre> | n/a | yes |
3535
| <a name="input_arch"></a> [arch](#input\_arch) | (Optional) The type of the CPU architecture. Valid values are `amd64`, `arm64`. Defaults to `amd64`. | `string` | `"amd64"` | no |
36+
| <a name="input_region"></a> [region](#input\_region) | (Optional) The region in which to create the module resources. If not provided, the module resources will be created in the provider's configured region. | `string` | `null` | no |
3637

3738
## Outputs
3839

@@ -43,4 +44,5 @@ No modules.
4344
| <a name="output_kubernetes_version"></a> [kubernetes\_version](#output\_kubernetes\_version) | The version of Kubernetes. |
4445
| <a name="output_os"></a> [os](#output\_os) | The configuration of OS (Operating System) of the AMI |
4546
| <a name="output_parameter"></a> [parameter](#output\_parameter) | The parameter name of SSM Parameter Store. |
47+
| <a name="output_region"></a> [region](#output\_region) | The AWS region this module resources resides in. |
4648
<!-- END_TF_DOCS -->

modules/eks-official-image/main.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,7 @@ locals {
6060
###################################################
6161

6262
data "aws_ssm_parameter" "this" {
63+
region = var.region
64+
6365
name = local.parameter_name
6466
}

modules/eks-official-image/outputs.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
output "region" {
2+
description = "The AWS region this module resources resides in."
3+
value = data.aws_ssm_parameter.this.region
4+
}
5+
16
output "id" {
27
description = "The ID of the EKS official AMI."
38
value = data.aws_ssm_parameter.this.insecure_value

modules/eks-official-image/variables.tf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
variable "region" {
2+
description = "(Optional) The region in which to create the module resources. If not provided, the module resources will be created in the provider's configured region."
3+
type = string
4+
default = null
5+
nullable = true
6+
}
7+
18
variable "kubernetes_version" {
29
description = "(Required) Desired Kubernetes version to search the official EKS AMIs for the EKS cluster."
310
type = string
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
2-
required_version = ">= 1.6"
2+
required_version = ">= 1.12"
33

44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.42"
7+
version = ">= 6.12"
88
}
99
}
1010
}

0 commit comments

Comments
 (0)