fix: make subnet parameters for bastion and operator optional

Resolves #650

Signed-off-by: Ali Mukadam <[email protected]>

Author: hyder

main.tf

@@ -189,11 +189,13 @@ module "network" {
   label_prefix   = var.label_prefix
 
   # oke networking parameters
-  assign_dns   = var.assign_dns
-  ig_route_id  = local.ig_route_id
-  nat_route_id = local.nat_route_id
-  subnets      = var.subnets
-  vcn_id       = local.vcn_id
+  assign_dns      = var.assign_dns
+  ig_route_id     = local.ig_route_id
+  nat_route_id    = local.nat_route_id
+  subnets         = var.subnets
+  create_bastion  = var.create_bastion_host
+  create_operator = var.create_operator
+  vcn_id          = local.vcn_id
 
 
   # control plane endpoint parameters

modules/network/locals.tf

@@ -10,13 +10,13 @@ locals {
   vcn_cidr = element(data.oci_core_vcn.vcn.cidr_blocks, 0)
 
   # subnet cidrs - used by subnets
-  bastion_subnet = cidrsubnet(local.vcn_cidr, lookup(var.subnets["bastion"], "newbits"), lookup(var.subnets["bastion"], "netnum"))
-
-  cp_subnet = cidrsubnet(local.vcn_cidr, lookup(var.subnets["cp"], "newbits"), lookup(var.subnets["cp"], "netnum"))
+  bastion_subnet = var.create_bastion ? cidrsubnet(local.vcn_cidr, lookup(var.subnets["bastion"], "newbits",13), lookup(var.subnets["bastion"], "netnum",0)) : ""
+  
+  cp_subnet = cidrsubnet(local.vcn_cidr, lookup(var.subnets["cp"], "newbits",13), lookup(var.subnets["cp"], "netnum",1))
 
   int_lb_subnet = cidrsubnet(local.vcn_cidr, lookup(var.subnets["int_lb"], "newbits"), lookup(var.subnets["int_lb"], "netnum"))
 
-  operator_subnet = cidrsubnet(local.vcn_cidr, lookup(var.subnets["operator"], "newbits"), lookup(var.subnets["operator"], "netnum"))
+  operator_subnet = var.create_operator ? cidrsubnet(local.vcn_cidr, lookup(var.subnets["operator"], "newbits"), lookup(var.subnets["operator"], "netnum")) : ""
 
   pub_lb_subnet = cidrsubnet(local.vcn_cidr, lookup(var.subnets["pub_lb"], "newbits"), lookup(var.subnets["pub_lb"], "netnum"))
 

modules/network/variables.tf

@@ -15,6 +15,14 @@ variable "subnets" {
   type = map(any)
 }
 
+variable "create_bastion" {
+  type = bool
+}
+
+variable "create_operator" {
+  type = bool
+}
+
 variable "vcn_id" {}
 
 # cluster endpoint
@@ -83,4 +91,4 @@ variable "public_lb_allowed_ports" {
 
 variable "create_fss" {
   type = bool
-}
+}