diff --git a/terraform/aws/main.tf b/terraform/aws/main.tf index 1a7d97f..1492f55 100644 --- a/terraform/aws/main.tf +++ b/terraform/aws/main.tf @@ -51,15 +51,13 @@ module "eks" { cluster_name = "cluster-${var.name_suffix}" cluster_version = "1.21" - cluster_create_timeout = "30m" - cluster_delete_timeout = "30m" - subnets = module.vpc.private_subnets + subnet_ids = module.vpc.private_subnets cluster_endpoint_private_access = "true" cluster_endpoint_public_access = "true" tags = var.resource_tags vpc_id = module.vpc.vpc_id - node_groups = { + eks_managed_node_groups = { first = { desired_capacity = 1 max_capacity = 10 @@ -67,6 +65,11 @@ module "eks" { instance_types = [var.ec2_eks_instance_type] } } + cluster_timeouts = { + create = "30m" + update = "30m" + delete = "30m" + } #write_kubeconfig = true #config_output_path = "./" @@ -79,11 +82,6 @@ output "cluster_name" { value = "cluster-${var.name_suffix}" } -output "kubectl_config" { - description = "kubectl config as generated by the module." - value = module.eks.kubeconfig -} - output "cluster_security_group_id" { description = "Security group ids attached to the cluster control plane." value = module.eks.cluster_security_group_id diff --git a/terraform/aws/variables.tf b/terraform/aws/variables.tf index 2609059..ee166a2 100644 --- a/terraform/aws/variables.tf +++ b/terraform/aws/variables.tf @@ -41,6 +41,12 @@ variable "ec2_rds_instance_type" { default = "db.t3.medium" } +variable "ec2_rds_deletion_protection" { + description = "If the DB instance should have deletion protection enabled." + type = bool + default = true +} + resource "random_password" "db_password" { length = 16 special = false