Skip to content

Commit

Permalink
chore: Update module versions to standardize and remove deprecation e…
Browse files Browse the repository at this point in the history
…rrors/warnings (#243)

* chore: Update module versions to standardize and remove deprecation errors/warnings

* fix: Ignore jupyterhub which requires domain name

* chore: Align region variables and set `us-west-2` as default value

* chore: Modify plan filter to remove modules which are not plannable on their own

* chore: Exclude `workshop/` directory from plan CI workflow
  • Loading branch information
bryantbiggs authored Jul 11, 2023
1 parent b9af939 commit 5f5b0a5
Show file tree
Hide file tree
Showing 66 changed files with 195 additions and 191 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/plan-examples.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,17 @@ def get_examples():
"""
exclude = {
'ai-ml/ray/terraform', # Skip until we fix CI script to test as per v5 convention
'ai-ml/ray/terraform/examples/pytorch', # Example relies on cluster created by parent blueprint
'ai-ml/ray/terraform/examples/xgboost', # Example relies on cluster created by parent blueprint
'ai-ml/jupyterhub', # Requires a domain name
'analytics/terraform/datahub-on-eks/datahub-addon', # Internal module, covered under root example and not standalone
'analytics/terraform/datahub-on-eks/datahub-addon/modules/prereq' # Internal module, covered under root example and not standalone
'streaming/nifi', # Requires a domain name
}

projects = {
x.replace('/versions.tf', '')
for x in glob.glob('**/**/**/versions.tf', recursive=True)
if not re.match(r'^.+/_', x)
if not re.match(r'.*(modules|workshop).*', x)
}

print(json.dumps(list(projects.difference(exclude))))
Expand Down
4 changes: 2 additions & 2 deletions ai-ml/emr-spark-rapids/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Checkout the [documentation website](https://awslabs.github.io/data-on-eks/docs/
|------|--------|---------|
| <a name="module_amp_ingest_irsa"></a> [amp\_ingest\_irsa](#module\_amp\_ingest\_irsa) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.14 |
| <a name="module_ebs_csi_driver_irsa"></a> [ebs\_csi\_driver\_irsa](#module\_ebs\_csi\_driver\_irsa) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.14 |
| <a name="module_eks"></a> [eks](#module\_eks) | terraform-aws-modules/eks/aws | ~> 19.13 |
| <a name="module_eks"></a> [eks](#module\_eks) | terraform-aws-modules/eks/aws | ~> 19.15 |
| <a name="module_eks_blueprints_kubernetes_addons"></a> [eks\_blueprints\_kubernetes\_addons](#module\_eks\_blueprints\_kubernetes\_addons) | aws-ia/eks-blueprints-addons/aws | ~> 1.0 |
| <a name="module_emr_containers"></a> [emr\_containers](#module\_emr\_containers) | ../../workshop/modules/emr-eks-containers | n/a |
| <a name="module_kubernetes_data_addons"></a> [kubernetes\_data\_addons](#module\_kubernetes\_data\_addons) | ../../workshop/modules/terraform-aws-eks-data-addons | n/a |
Expand Down Expand Up @@ -69,7 +69,7 @@ Checkout the [documentation website](https://awslabs.github.io/data-on-eks/docs/
| <a name="input_name"></a> [name](#input\_name) | Name of the VPC and EKS Cluster | `string` | `"emr-spark-rapids"` | no |
| <a name="input_private_subnets"></a> [private\_subnets](#input\_private\_subnets) | Private Subnets CIDRs. 254 IPs per Subnet/AZ for Private NAT + NLB + Airflow + EC2 Jumphost etc. | `list(string)` | <pre>[<br> "10.1.1.0/24",<br> "10.1.2.0/24"<br>]</pre> | no |
| <a name="input_public_subnets"></a> [public\_subnets](#input\_public\_subnets) | Public Subnets CIDRs. 62 IPs per Subnet/AZ | `list(string)` | <pre>[<br> "10.1.0.0/26",<br> "10.1.0.64/26"<br>]</pre> | no |
| <a name="input_region"></a> [region](#input\_region) | region | `string` | `"us-west-2"` | no |
| <a name="input_region"></a> [region](#input\_region) | Region | `string` | `"us-west-2"` | no |
| <a name="input_secondary_cidr_blocks"></a> [secondary\_cidr\_blocks](#input\_secondary\_cidr\_blocks) | Secondary CIDR blocks to be attached to VPC | `string` | `"100.64.0.0/16"` | no |
| <a name="input_tags"></a> [tags](#input\_tags) | Default tags | `map(string)` | `{}` | no |
| <a name="input_vpc_cidr"></a> [vpc\_cidr](#input\_vpc\_cidr) | VPC CIDR. This should be a valid private (RFC 1918) CIDR range | `string` | `"10.1.0.0/16"` | no |
Expand Down
2 changes: 1 addition & 1 deletion ai-ml/emr-spark-rapids/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ locals {

module "eks" {
source = "terraform-aws-modules/eks/aws"
version = "~> 19.13"
version = "~> 19.15"

cluster_name = local.name
cluster_version = var.eks_cluster_version
Expand Down
4 changes: 3 additions & 1 deletion ai-ml/emr-spark-rapids/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ variable "name" {
default = "emr-spark-rapids"
type = string
}

variable "region" {
description = "region"
description = "Region"
type = string
default = "us-west-2"
}

variable "eks_cluster_version" {
description = "EKS Cluster version"
default = "1.26"
Expand Down
2 changes: 1 addition & 1 deletion ai-ml/jupyterhub/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ locals {
#---------------------------------------------------------------
module "eks" {
source = "terraform-aws-modules/eks/aws"
version = "~> 19.13"
version = "~> 19.15"

cluster_name = local.name
cluster_version = var.eks_cluster_version
Expand Down
2 changes: 1 addition & 1 deletion ai-ml/jupyterhub/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ variable "name" {
}

variable "region" {
description = "region"
description = "Region"
type = string
default = "us-west-2"
}
Expand Down
9 changes: 4 additions & 5 deletions ai-ml/jupyterhub/vpc.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ locals {
#---------------------------------------------------------------
module "vpc" {
source = "terraform-aws-modules/vpc/aws"
version = "~> 4.0"
version = "~> 5.0"

name = local.name
cidr = var.vpc_cidr
Expand All @@ -31,10 +31,9 @@ module "vpc" {
# ------------------------------
# Optional Public Subnets for NAT and IGW for PoC/Dev/Test environments
# Public Subnets can be disabled while deploying to Production and use Private NAT + TGW
public_subnets = local.public_subnets
enable_nat_gateway = true
single_nat_gateway = true
enable_dns_hostnames = true
public_subnets = local.public_subnets
enable_nat_gateway = true
single_nat_gateway = true
#-------------------------------

public_subnet_tags = {
Expand Down
10 changes: 5 additions & 5 deletions ai-ml/ray/terraform/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ Checkout the [documentation website](https://awslabs.github.io/data-on-eks/docs/

| Name | Source | Version |
|------|--------|---------|
| <a name="module_eks"></a> [eks](#module\_eks) | terraform-aws-modules/eks/aws | ~> 19.10 |
| <a name="module_eks"></a> [eks](#module\_eks) | terraform-aws-modules/eks/aws | ~> 19.15 |
| <a name="module_eks_blueprints_addons"></a> [eks\_blueprints\_addons](#module\_eks\_blueprints\_addons) | github.com/aws-ia/terraform-aws-eks-blueprints-addons | 08650fd2b4bc894bde7b51313a8dc9598d82e925 |
| <a name="module_karpenter"></a> [karpenter](#module\_karpenter) | terraform-aws-modules/eks/aws//modules/karpenter | ~> 19.9 |
| <a name="module_karpenter_policy"></a> [karpenter\_policy](#module\_karpenter\_policy) | terraform-aws-modules/iam/aws//modules/iam-policy | ~> 5.11.1 |
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 3.0 |
| <a name="module_karpenter"></a> [karpenter](#module\_karpenter) | terraform-aws-modules/eks/aws//modules/karpenter | ~> 19.15 |
| <a name="module_karpenter_policy"></a> [karpenter\_policy](#module\_karpenter\_policy) | terraform-aws-modules/iam/aws//modules/iam-policy | ~> 5.20 |
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 |

## Resources

Expand All @@ -48,7 +48,7 @@ Checkout the [documentation website](https://awslabs.github.io/data-on-eks/docs/
|------|-------------|------|---------|:--------:|
| <a name="input_eks_cluster_version"></a> [eks\_cluster\_version](#input\_eks\_cluster\_version) | EKS Cluster version | `string` | `"1.25"` | no |
| <a name="input_name"></a> [name](#input\_name) | Name of the VPC, EKS Cluster and Ray cluster | `string` | `"ray-cluster"` | no |
| <a name="input_region"></a> [region](#input\_region) | AWS Region | `string` | `"us-west-2"` | no |
| <a name="input_region"></a> [region](#input\_region) | Region | `string` | `"us-west-2"` | no |

## Outputs

Expand Down
2 changes: 1 addition & 1 deletion ai-ml/ray/terraform/examples/pytorch/variables.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variable "region" {
description = "region"
description = "Region"
type = string
default = "us-west-2"
}
2 changes: 1 addition & 1 deletion ai-ml/ray/terraform/examples/xgboost/variables.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variable "region" {
description = "region"
description = "Region"
type = string
default = "us-west-2"
}
6 changes: 3 additions & 3 deletions ai-ml/ray/terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ locals {
#tfsec:ignore:aws-eks-enable-control-plane-logging
module "eks" {
source = "terraform-aws-modules/eks/aws"
version = "~> 19.10"
version = "~> 19.15"

cluster_name = local.name
cluster_version = local.cluster_version
Expand Down Expand Up @@ -190,7 +190,7 @@ resource "kubectl_manifest" "eni_config" {

module "karpenter" {
source = "terraform-aws-modules/eks/aws//modules/karpenter"
version = "~> 19.9"
version = "~> 19.15"

cluster_name = module.eks.cluster_name
irsa_oidc_provider_arn = module.eks.oidc_provider_arn
Expand All @@ -206,7 +206,7 @@ module "karpenter" {
# https://github.com/ray-project/kuberay/issues/746
module "karpenter_policy" {
source = "terraform-aws-modules/iam/aws//modules/iam-policy"
version = "~> 5.11.1"
version = "~> 5.20"

name = "KarpenterS3ReadOnlyPolicy"
description = "IAM Policy to allow read from an S3 bucket for karpenter nodes"
Expand Down
2 changes: 1 addition & 1 deletion ai-ml/ray/terraform/variables.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variable "region" {
description = "AWS Region"
description = "Region"
type = string
default = "us-west-2"
}
Expand Down
7 changes: 3 additions & 4 deletions ai-ml/ray/terraform/vpc.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

module "vpc" {
source = "terraform-aws-modules/vpc/aws"
version = "~> 3.0"
version = "~> 5.0"

name = local.name
cidr = local.vpc_cidr
Expand All @@ -20,9 +20,8 @@ module "vpc" {
# Control Plane Subnets
intra_subnets = [for k, v in local.azs : cidrsubnet(local.vpc_cidr, 8, k + 52)]

enable_nat_gateway = true
single_nat_gateway = true
enable_dns_hostnames = true
enable_nat_gateway = true
single_nat_gateway = true

enable_flow_log = true
create_flow_log_cloudwatch_iam_role = true
Expand Down
10 changes: 5 additions & 5 deletions analytics/terraform/datahub-on-eks/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ Checkout the [documentation website](https://awslabs.github.io/data-on-eks/docs/
|------|--------|---------|
| <a name="module_datahub"></a> [datahub](#module\_datahub) | ./datahub-addon | n/a |
| <a name="module_ebs_csi_driver_irsa"></a> [ebs\_csi\_driver\_irsa](#module\_ebs\_csi\_driver\_irsa) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.14 |
| <a name="module_eks"></a> [eks](#module\_eks) | terraform-aws-modules/eks/aws | ~> 19.13 |
| <a name="module_eks"></a> [eks](#module\_eks) | terraform-aws-modules/eks/aws | ~> 19.15 |
| <a name="module_eks_blueprints_kubernetes_addons"></a> [eks\_blueprints\_kubernetes\_addons](#module\_eks\_blueprints\_kubernetes\_addons) | aws-ia/eks-blueprints-addons/aws | ~> 0.2.0 |
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 4.0 |
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 |
| <a name="module_vpc_cni_irsa"></a> [vpc\_cni\_irsa](#module\_vpc\_cni\_irsa) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.14 |
| <a name="module_vpc_endpoints"></a> [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | ~> 4.0 |
| <a name="module_vpc_endpoints_sg"></a> [vpc\_endpoints\_sg](#module\_vpc\_endpoints\_sg) | terraform-aws-modules/security-group/aws | ~> 4.0 |
| <a name="module_vpc_endpoints"></a> [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | ~> 5.0 |
| <a name="module_vpc_endpoints_sg"></a> [vpc\_endpoints\_sg](#module\_vpc\_endpoints\_sg) | terraform-aws-modules/security-group/aws | ~> 5.0 |

## Resources

Expand All @@ -52,7 +52,7 @@ Checkout the [documentation website](https://awslabs.github.io/data-on-eks/docs/
| <a name="input_name"></a> [name](#input\_name) | Name of the VPC and EKS Cluster | `string` | `"datahub-on-eks"` | no |
| <a name="input_private_subnets"></a> [private\_subnets](#input\_private\_subnets) | Private Subnets CIDRs. 32766 Subnet1 and 16382 Subnet2 IPs per Subnet | `list(string)` | <pre>[<br> "10.1.0.0/17",<br> "10.1.128.0/18"<br>]</pre> | no |
| <a name="input_public_subnets"></a> [public\_subnets](#input\_public\_subnets) | Public Subnets CIDRs. 62 IPs per Subnet | `list(string)` | <pre>[<br> "10.1.255.128/26",<br> "10.1.255.192/26"<br>]</pre> | no |
| <a name="input_region"></a> [region](#input\_region) | region | `string` | `"us-west-2"` | no |
| <a name="input_region"></a> [region](#input\_region) | Region | `string` | `"us-west-2"` | no |
| <a name="input_tags"></a> [tags](#input\_tags) | Default tags | `map(string)` | `{}` | no |
| <a name="input_vpc_cidr"></a> [vpc\_cidr](#input\_vpc\_cidr) | VPC CIDR | `string` | `"10.1.0.0/16"` | no |

Expand Down
2 changes: 1 addition & 1 deletion analytics/terraform/datahub-on-eks/main.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module "eks" {
source = "terraform-aws-modules/eks/aws"
version = "~> 19.13"
version = "~> 19.15"

cluster_name = local.name
cluster_version = var.eks_cluster_version
Expand Down
2 changes: 1 addition & 1 deletion analytics/terraform/datahub-on-eks/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ variable "name" {
}

variable "region" {
description = "region"
description = "Region"
type = string
default = "us-west-2"
}
Expand Down
16 changes: 8 additions & 8 deletions analytics/terraform/datahub-on-eks/vpc.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#---------------------------------------------------------------
module "vpc" {
source = "terraform-aws-modules/vpc/aws"
version = "~> 4.0"
version = "~> 5.0"

name = local.name
cidr = local.vpc_cidr
Expand Down Expand Up @@ -34,10 +34,10 @@ module "vpc" {
}

module "vpc_endpoints_sg" {
count = var.enable_vpc_endpoints ? 1 : 0

source = "terraform-aws-modules/security-group/aws"
version = "~> 4.0"
version = "~> 5.0"

create = var.enable_vpc_endpoints

name = "${local.name}-vpc-endpoints"
description = "Security group for VPC endpoint access"
Expand All @@ -63,13 +63,13 @@ module "vpc_endpoints_sg" {
}

module "vpc_endpoints" {
count = var.enable_vpc_endpoints ? 1 : 0

source = "terraform-aws-modules/vpc/aws//modules/vpc-endpoints"
version = "~> 4.0"
version = "~> 5.0"

create = var.enable_vpc_endpoints

vpc_id = module.vpc.vpc_id
security_group_ids = [module.vpc_endpoints_sg[0].security_group_id]
security_group_ids = [module.vpc_endpoints_sg.security_group_id]

endpoints = merge({
s3 = {
Expand Down
6 changes: 3 additions & 3 deletions analytics/terraform/emr-eks-ack/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ Checkout the [documentation website](https://awslabs.github.io/data-on-eks/docs/
| Name | Source | Version |
|------|--------|---------|
| <a name="module_ebs_csi_driver_irsa"></a> [ebs\_csi\_driver\_irsa](#module\_ebs\_csi\_driver\_irsa) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.14 |
| <a name="module_eks"></a> [eks](#module\_eks) | terraform-aws-modules/eks/aws | ~> 19.9 |
| <a name="module_eks"></a> [eks](#module\_eks) | terraform-aws-modules/eks/aws | ~> 19.15 |
| <a name="module_eks_blueprints_kubernetes_addons"></a> [eks\_blueprints\_kubernetes\_addons](#module\_eks\_blueprints\_kubernetes\_addons) | github.com/aws-ia/terraform-aws-eks-blueprints-addons | 08650fd2b4bc894bde7b51313a8dc9598d82e925 |
| <a name="module_emr_ack"></a> [emr\_ack](#module\_emr\_ack) | ../../../workshop/modules/emr-ack | n/a |
| <a name="module_emr_containers"></a> [emr\_containers](#module\_emr\_containers) | ../../../workshop/modules/emr-eks-containers | n/a |
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 3.0 |
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 |
| <a name="module_vpc_cni_irsa"></a> [vpc\_cni\_irsa](#module\_vpc\_cni\_irsa) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.14 |

## Resources
Expand All @@ -49,7 +49,7 @@ Checkout the [documentation website](https://awslabs.github.io/data-on-eks/docs/
| <a name="input_name"></a> [name](#input\_name) | Name of the VPC and EKS Cluster | `string` | `"emr-eks-ack"` | no |
| <a name="input_private_subnets"></a> [private\_subnets](#input\_private\_subnets) | Private Subnets CIDRs. 32766 Subnet1 and 16382 Subnet2 IPs per Subnet | `list(string)` | <pre>[<br> "10.1.0.0/17",<br> "10.1.128.0/18"<br>]</pre> | no |
| <a name="input_public_subnets"></a> [public\_subnets](#input\_public\_subnets) | Public Subnets CIDRs. 62 IPs per Subnet | `list(string)` | <pre>[<br> "10.1.255.128/26",<br> "10.1.255.192/26"<br>]</pre> | no |
| <a name="input_region"></a> [region](#input\_region) | Region | `string` | n/a | yes |
| <a name="input_region"></a> [region](#input\_region) | Region | `string` | `"us-west-2"` | no |
| <a name="input_tags"></a> [tags](#input\_tags) | Default tags | `map(string)` | `{}` | no |
| <a name="input_vpc_cidr"></a> [vpc\_cidr](#input\_vpc\_cidr) | VPC CIDR | `string` | `"10.1.0.0/16"` | no |

Expand Down
2 changes: 1 addition & 1 deletion analytics/terraform/emr-eks-ack/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

module "eks" {
source = "terraform-aws-modules/eks/aws"
version = "~> 19.9"
version = "~> 19.15"

cluster_name = local.name
cluster_version = var.eks_cluster_version
Expand Down
1 change: 1 addition & 0 deletions analytics/terraform/emr-eks-ack/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ variable "name" {
variable "region" {
description = "Region"
type = string
default = "us-west-2"
}

variable "eks_cluster_version" {
Expand Down
14 changes: 7 additions & 7 deletions analytics/terraform/emr-eks-ack/vpc.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
#---------------------------------------------------------------
module "vpc" {
source = "terraform-aws-modules/vpc/aws"
version = "~> 3.0"
version = "~> 5.0"

name = local.name
cidr = local.vpc_cidr
azs = local.azs

name = local.name
cidr = local.vpc_cidr
azs = local.azs
public_subnets = var.public_subnets
private_subnets = var.private_subnets

enable_nat_gateway = true
single_nat_gateway = true
enable_dns_hostnames = true
enable_nat_gateway = true
single_nat_gateway = true

# Manage so we can name
manage_default_network_acl = true
Expand Down
6 changes: 3 additions & 3 deletions analytics/terraform/emr-eks-fargate/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ Checkout the [documentation website](https://awslabs.github.io/data-on-eks/docs/

| Name | Source | Version |
|------|--------|---------|
| <a name="module_eks"></a> [eks](#module\_eks) | terraform-aws-modules/eks/aws | ~> 19.5 |
| <a name="module_eks"></a> [eks](#module\_eks) | terraform-aws-modules/eks/aws | ~> 19.15 |
| <a name="module_eks_blueprints_kubernetes_addons"></a> [eks\_blueprints\_kubernetes\_addons](#module\_eks\_blueprints\_kubernetes\_addons) | github.com/aws-ia/terraform-aws-eks-blueprints-addons | 08650fd2b4bc894bde7b51313a8dc9598d82e925 |
| <a name="module_emr_containers"></a> [emr\_containers](#module\_emr\_containers) | ../../../workshop/modules/emr-eks-containers | n/a |
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 3.0 |
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 |
| <a name="module_vpc_cni_irsa"></a> [vpc\_cni\_irsa](#module\_vpc\_cni\_irsa) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.14 |

## Resources
Expand All @@ -45,7 +45,7 @@ Checkout the [documentation website](https://awslabs.github.io/data-on-eks/docs/
| <a name="input_name"></a> [name](#input\_name) | Name of the VPC and EKS Cluster | `string` | `"emr-eks-fargate"` | no |
| <a name="input_private_subnets"></a> [private\_subnets](#input\_private\_subnets) | Private Subnets CIDRs. 32766 Subnet1 and 16382 Subnet2 IPs per Subnet | `list(string)` | <pre>[<br> "10.1.0.0/17",<br> "10.1.128.0/18"<br>]</pre> | no |
| <a name="input_public_subnets"></a> [public\_subnets](#input\_public\_subnets) | Public Subnets CIDRs. 62 IPs per Subnet | `list(string)` | <pre>[<br> "10.1.255.128/26",<br> "10.1.255.192/26"<br>]</pre> | no |
| <a name="input_region"></a> [region](#input\_region) | Region | `string` | n/a | yes |
| <a name="input_region"></a> [region](#input\_region) | Region | `string` | `"us-west-2"` | no |
| <a name="input_tags"></a> [tags](#input\_tags) | Default tags | `map(string)` | `{}` | no |
| <a name="input_vpc_cidr"></a> [vpc\_cidr](#input\_vpc\_cidr) | VPC CIDR | `string` | `"10.1.0.0/16"` | no |

Expand Down
2 changes: 1 addition & 1 deletion analytics/terraform/emr-eks-fargate/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ locals {
#tfsec:ignore:aws-eks-enable-control-plane-logging
module "eks" {
source = "terraform-aws-modules/eks/aws"
version = "~> 19.5"
version = "~> 19.15"

cluster_name = local.name
cluster_version = var.eks_cluster_version
Expand Down
1 change: 1 addition & 0 deletions analytics/terraform/emr-eks-fargate/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ variable "name" {
variable "region" {
description = "Region"
type = string
default = "us-west-2"
}

variable "eks_cluster_version" {
Expand Down
Loading

0 comments on commit 5f5b0a5

Please sign in to comment.