example extra subnet

Signed-off-by: junior <junior@users.noreply.github.com>

Author: junior

modules/new-subnet-from-oke-vcn/providers.tf

@@ -7,8 +7,8 @@ terraform {
   required_providers {
     oci = {
       source  = "oracle/oci"
-      version = ">= 4.88.1"
-      # https://registry.terraform.io/providers/oracle/oci/4.88.1
+      version = "~> 4"
+      # https://registry.terraform.io/providers/oracle/oci/
     }
   }
 }

modules/new-subnet-from-oke-vcn/security-lists.tf

@@ -33,7 +33,7 @@ resource "oci_core_security_list" "extra_subnet_security_list" {
     stateless        = false
   }
 
-  count = var.create_new_oke_cluster ? 1 : 0
+  count = var.create_new_subnet ? 1 : 0
 }
 
 locals {

modules/new-subnet-from-oke-vcn/subnet.tf

@@ -6,13 +6,15 @@ resource "oci_core_subnet" "extra_subnet" {
   cidr_block                 = lookup(var.network_cidrs, "EXTRA-SUBNET-REGIONAL-CIDR")
   compartment_id             = var.oke_vcn_compartment_ocid
   display_name               = "${local.subnet_name_normalized}-subnet-${local.deploy_id}"
-  dns_label                  = "${local.subnet_name_normalized}${local.deploy_id}"
+  dns_label                  = "${local.app_name_for_dns}${local.deploy_id}"
   vcn_id                     = var.oke_vcn_ocid
   prohibit_public_ip_on_vnic = true
   route_table_id             = oci_core_route_table.extra_subnet_route_table[0].id
-  dhcp_options_id            = var.oke_vcn_default_dhcp_id
+  dhcp_options_id            = var.oke_vcn_default_dhcp_ocid
   security_list_ids          = [oci_core_security_list.extra_subnet_security_list[0].id]
   freeform_tags              = var.freeform_deployment_tags
+
+  count = var.create_new_subnet ? 1 : 0
 }
 
 resource "oci_core_route_table" "extra_subnet_route_table" {
@@ -25,6 +27,8 @@ resource "oci_core_route_table" "extra_subnet_route_table" {
     description       = "Traffic to/from internet"
     destination       = lookup(var.network_cidrs, "ALL-CIDR")
     destination_type  = "CIDR_BLOCK"
-    network_entity_id = oci_core_internet_gateway.oke_internet_gateway[0].id
+    network_entity_id = var.oke_vcn_internet_gateway_ocid
   }
+
+  count = var.create_new_subnet ? 1 : 0
 }

modules/new-subnet-from-oke-vcn/variables.tf

@@ -2,6 +2,11 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 # 
 
+variable "create_new_subnet" {
+  default     = false
+  description = "Create a new node pool if true or use an existing one if false"
+}
+
 variable "network_cidrs" {
   type = map(string)
 
@@ -35,7 +40,14 @@ variable "subnet_name" {
   description = "Subnet Name"
 }
 
+# Deployment Details + Freeform Tags
+variable "freeform_deployment_tags" {
+  description = "Tags to be added to the resources"
+}
+
 # Subnet Name Locals
 locals {
+  app_name_for_dns = substr(lower(replace(local.app_name,"/\\W|_|\\s/","")), 0, 6)
   subnet_name_normalized = substr(replace(lower(var.subnet_name), " ", "-"), 0, 6)
+  deploy_id              = var.freeform_deployment_tags.DeploymentID
 }