Merge pull request #16 from pluralsh/fix/various

Fix/various
pluralsh · Jan 4, 2024 · aab8e7b · aab8e7b
2 parents afa2bbd + 646a70a
commit aab8e7b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/terraform/clouds/aws/eks.tf b/terraform/clouds/aws/eks.tf
@@ -5,14 +5,14 @@ module "eks" {
   cluster_name    = var.cluster_name
   cluster_version = var.kubernetes_version
 
-  cluster_endpoint_public_access  = var.public
+  cluster_endpoint_public_access = var.public
 
-  vpc_id                   = module.vpc.id
-  subnet_ids               = module.vpc.private_subnet_ids
-  control_plane_subnet_ids = module.vpc.public_subnet_ids
+  vpc_id                   = module.vpc.vpc_id
+  subnet_ids               = module.vpc.private_subnets
+  control_plane_subnet_ids = module.vpc.public_subnets
 
   # EKS Managed Node Group(s)
   eks_managed_node_group_defaults = var.node_group_defaults
 
   eks_managed_node_groups = var.managed_node_groups
-}
+}
diff --git a/terraform/clouds/aws/postgres.tf b/terraform/clouds/aws/postgres.tf
@@ -7,7 +7,7 @@ resource "random_password" "password" {
 }
 
 module "db" {
-  count = var.create_db ? 1 : 0
+  count  = var.create_db ? 1 : 0
   source = "terraform-aws-modules/rds/aws"
 
   identifier = local.db_name
@@ -31,10 +31,10 @@ module "db" {
   monitoring_interval    = "30"
   monitoring_role_name   = "PluralRDSMonitoringRole"
   create_monitoring_role = true
-  
+
   # DB subnet group
   create_db_subnet_group = true
-  subnet_ids             = module.vpc.private_subnet_ids
+  subnet_ids             = module.vpc.private_subnets
   vpc_security_group_ids = [module.security_group.security_group_id]
 
   parameters = [
@@ -70,4 +70,4 @@ module "security_group" {
       cidr_blocks = module.vpc.vpc_cidr_block
     },
   ]
-}
+}
diff --git a/terraform/clouds/aws/variables.tf b/terraform/clouds/aws/variables.tf
@@ -35,7 +35,7 @@ variable "vpc_cidr" {
 
 variable "private_subnets" {
   type    = list(string)
-  default = ["10.0.1.0/20", "10.0.2.0/20", "10.0.3.0/20"]
+  default = ["10.1.0.0/20", "10.1.16.0/20", "10.1.32.0/20"]
 }
 
 variable "public_subnets" {