(#75) use byo vpc cidr for nfs export and private cluster range (#79)

sassoftware · Jul 7, 2021 · 0a1a87e · 0a1a87e
1 parent f6dcedb
commit 0a1a87e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/main.tf b/main.tf
@@ -209,7 +209,7 @@ data "template_file" "nfs-cloudconfig" {
 
   vars = {
     vm_admin        = var.nfs_vm_admin
-    base_cidr_block = var.vpc_cidr
+    base_cidr_block = module.vpc.vpc_cidr
   }
 
 }
@@ -346,7 +346,7 @@ module "eks" {
   cluster_name                          = local.cluster_name
   cluster_version                       = var.kubernetes_version
   cluster_endpoint_private_access       = true
-  cluster_endpoint_private_access_cidrs = [var.vpc_cidr]
+  cluster_endpoint_private_access_cidrs = [module.vpc.vpc_cidr]
   cluster_endpoint_public_access        = true
   cluster_endpoint_public_access_cidrs  = local.cluster_endpoint_public_access_cidrs
   write_kubeconfig                      = false

diff --git a/modules/aws_vpc/outputs.tf b/modules/aws_vpc/outputs.tf
@@ -44,3 +44,8 @@ output "private_route_table_ids" {
   description = "List of IDs of private route tables"
   value       = aws_route_table.private.*.id
 }
+
+output "vpc_cidr" {
+  description = "CIDR block of VPC"
+  value       = var.vpc_id == null ? var.cidr : data.aws_vpc.vpc[0].cidr_block
+}