refactor: remove unused network area routes and update routing configurations

Author: mahauber

modules/connectivity-global/1-network-area.tf

@@ -14,7 +14,7 @@ resource "stackit_network_area" "this" {
 
   organization_id = var.organization_id
   name            = each.key
-  labels          = length(local.project_labels) > 0 ? local.project_labels : null
+  labels          = merge(local.project_labels, { "preview/routingtables" = "true" })
 }
 
 resource "stackit_network_area_region" "this" {
@@ -31,18 +31,4 @@ resource "stackit_network_area_region" "this" {
     default_prefix_length = each.value.default_prefix_length
     default_nameservers   = each.value.default_nameservers
   }
-}
-
-############################
-## NETWORK AREA - ROUTING ##
-############################
-
-resource "stackit_network_area_route" "this" {
-  for_each = { for r in var.network_area_routes : r.name => r }
-
-  organization_id = var.organization_id
-  network_area_id = stackit_network_area.this[each.value.network_area_name].network_area_id
-
-  destination = each.value.destination
-  next_hop    = each.value.next_hop
 }

modules/connectivity-global/variables.tf

@@ -18,28 +18,11 @@ variable "network_areas" {
     max_prefix_length      = optional(number, 28)
     min_prefix_length      = optional(number, 24)
     default_prefix_length  = optional(number, 28)
-    default_nameservers    = optional(list(string), null)
+    default_nameservers    = optional(list(string), ["1.0.0.1", "1.1.1.1"])
   }))
   description = "List of network areas to create, each with its own name, ranges, and configuration."
 }
 
-variable "network_area_routes" {
-  type = list(object({
-    name              = string
-    network_area_name = string
-    destination = object({
-      type  = string
-      value = string
-    })
-    next_hop = object({
-      type  = string
-      value = optional(string)
-    })
-  }))
-  description = "List of static routes to create within network areas. Each route references a network area by name."
-  default     = []
-}
-
 variable "organization_id" {
   type        = string
   description = "Container ID of the root folder or organization under which the company folder will be created."

modules/connectivity-regional/2-network.tf

@@ -2,28 +2,34 @@
 ## NETWORKS ##
 ##############
 
-# will get auto assigned a free range from the network area 
-resource "stackit_network" "hub" {
+resource "stackit_network" "lan" {
   project_id = stackit_resourcemanager_project.this.project_id
-  name       = "hub_network"
+  name       = "lan_network"
   routed     = true
 }
 
+resource "stackit_network" "wan" {
+  project_id       = stackit_resourcemanager_project.this.project_id
+  name             = "wan_network"
+  routing_table_id = stackit_routing_table.wan.routing_table_id
+  routed           = true # needs to be true, since floating will be attached to router; also means connected to network area --> will get routes from there as well
+}
+
 ################
 ## INTERFACES ##
 ################
 
 resource "stackit_network_interface" "wan" {
   name       = "vtnet0_wan"
   project_id = stackit_resourcemanager_project.this.project_id
-  network_id = stackit_network.hub.network_id
+  network_id = stackit_network.wan.network_id
   security   = false
 }
 
 resource "stackit_network_interface" "lan" {
   name       = "vtnet1_lan"
   project_id = stackit_resourcemanager_project.this.project_id
-  network_id = stackit_network.hub.network_id
+  network_id = stackit_network.lan.network_id
   security   = false
 }
 

modules/connectivity-regional/3-firewall.tf

@@ -56,7 +56,7 @@ resource "stackit_server" "pfsense_Server" {
   }
   availability_zone = var.firewall_zone
   machine_type      = var.firewall_flavor
-  
+
   network_interfaces = [
     stackit_network_interface.wan.network_interface_id, # vtnet0 = WAN
     stackit_network_interface.lan.network_interface_id  # vtnet1 = LAN

modules/connectivity-regional/4-routes.tf

@@ -1,24 +1,42 @@
-#########################
-## NETWORK AREA ROUTES ##
-#########################
+####################
+## FIREWALL ROUTE ##
+####################
 
-resource "stackit_network_area_route" "rfc1918_10" {
+resource "stackit_routing_table" "wan" {
   organization_id = var.organization_id
   network_area_id = var.network_area_id
-  destination = { type = "cidrv4", value = "10.0.0.0/8" }
-  next_hop    = { type = "ipv4",   value = stackit_network_interface.lan.ipv4 }
+  name            = "wan"
 }
 
-resource "stackit_network_area_route" "rfc1918_172" {
-  organization_id = var.organization_id
-  network_area_id = var.network_area_id
-  destination = { type = "cidrv4", value = "172.16.0.0/12" }
-  next_hop    = { type = "ipv4",   value = stackit_network_interface.lan.ipv4 }
+resource "stackit_routing_table_route" "wan" {
+  organization_id  = var.organization_id
+  network_area_id  = var.network_area_id
+  routing_table_id = stackit_routing_table.wan.routing_table_id
+
+  destination = {
+    type  = "cidrv4"
+    value = "0.0.0.0/0"
+  }
+
+  next_hop = {
+    type = "internet"
+  }
 }
 
-resource "stackit_network_area_route" "rfc1918_192" {
+#########################
+## NETWORK AREA ROUTES ##
+#########################
+
+resource "stackit_network_area_route" "default" {
   organization_id = var.organization_id
   network_area_id = var.network_area_id
-  destination = { type = "cidrv4", value = "192.168.0.0/16" }
-  next_hop    = { type = "ipv4",   value = stackit_network_interface.lan.ipv4 }
+
+  destination = {
+    type  = "cidrv4"
+    value = "0.0.0.0/0"
+  }
+  next_hop = {
+    type  = "ipv4"
+    value = stackit_network_interface.lan.ipv4
+  }
 }