Network refactoring

src/core/apim.tf

@@ -3,7 +3,7 @@ module "apim_snet" {
   source               = "git::https://github.com/pagopa/azurerm.git//subnet?ref=v1.0.58"
   name                 = format("%s-apim-snet", local.project)
   resource_group_name  = azurerm_resource_group.rg_vnet.name
-  virtual_network_name = module.vnet_integration.name
+  virtual_network_name = module.vnet.name
   address_prefixes     = var.cidr_subnet_apim
 
   enforce_private_link_endpoint_network_policies = true

src/core/dns_private.tf

@@ -15,16 +15,6 @@ resource "azurerm_private_dns_zone_virtual_network_link" "privatelink_documents_
   tags = var.tags
 }
 
-resource "azurerm_private_dns_zone_virtual_network_link" "privatelink_documents_azure_com_vnet_integration" {
-  name                  = module.vnet_integration.name
-  resource_group_name   = azurerm_resource_group.rg_vnet.name
-  private_dns_zone_name = azurerm_private_dns_zone.privatelink_documents_azure_com.name
-  virtual_network_id    = module.vnet_integration.id
-  registration_enabled  = false
-
-  tags = var.tags
-}
-
 resource "azurerm_private_dns_zone" "privatelink_mongo_cosmos_azure_com" {
   name                = "privatelink.mongo.cosmos.azure.com"
   resource_group_name = azurerm_resource_group.rg_vnet.name
@@ -40,14 +30,4 @@ resource "azurerm_private_dns_zone_virtual_network_link" "privatelink_mongo_cosm
   registration_enabled  = false
 
   tags = var.tags
-}
-
-resource "azurerm_private_dns_zone_virtual_network_link" "privatelink_mongo_cosmos_azure_com_vnet_integration" {
-  name                  = module.vnet_integration.name
-  resource_group_name   = azurerm_resource_group.rg_vnet.name
-  private_dns_zone_name = azurerm_private_dns_zone.privatelink_mongo_cosmos_azure_com.name
-  virtual_network_id    = module.vnet_integration.id
-  registration_enabled  = false
-
-  tags = var.tags
-}
+}

src/core/env/dev/terraform.tfvars

@@ -21,11 +21,7 @@ cidr_subnet_redis            = ["10.1.132.0/24"]
 cidr_subnet_vpn              = ["10.1.133.0/24"]
 cidr_subnet_dnsforwarder     = ["10.1.134.0/29"]
 cidr_subnet_cosmosdb_mongodb = ["10.1.135.0/24"]
-
-# integration vnet
-# https://www.davidc.net/sites/default/subnets/subnets.html?network=10.230.7.0&mask=24&division=7.31
-cidr_vnet_integration = ["10.230.7.0/24"] # ask to SIA
-cidr_subnet_apim      = ["10.230.7.0/26"]
+cidr_subnet_apim             = ["10.1.136.0/24"]
 
 # dns
 external_domain = "pagopa.it"

src/core/env/prod/terraform.tfvars

@@ -21,11 +21,7 @@ cidr_subnet_redis            = ["10.1.132.0/24"]
 cidr_subnet_vpn              = ["10.1.133.0/24"]
 cidr_subnet_dnsforwarder     = ["10.1.134.0/29"]
 cidr_subnet_cosmosdb_mongodb = ["10.1.135.0/24"]
-
-# integration vnet
-# https://www.davidc.net/sites/default/subnets/subnets.html?network=10.230.7.0&mask=24&division=7.31
-cidr_vnet_integration = ["10.230.7.0/24"] # todo ask to SIA
-cidr_subnet_apim      = ["10.230.7.0/26"]
+cidr_subnet_apim             = ["10.1.136.0/24"]
 
 # dns
 external_domain = "pagopa.it"

src/core/env/uat/terraform.tfvars

@@ -21,11 +21,8 @@ cidr_subnet_redis            = ["10.1.132.0/24"]
 cidr_subnet_vpn              = ["10.1.133.0/24"]
 cidr_subnet_dnsforwarder     = ["10.1.134.0/29"]
 cidr_subnet_cosmosdb_mongodb = ["10.1.135.0/24"]
+cidr_subnet_apim             = ["10.1.136.0/24"]
 
-# integration vnet
-# https://www.davidc.net/sites/default/subnets/subnets.html?network=10.230.7.0&mask=24&division=7.31
-cidr_vnet_integration = ["10.230.7.0/24"] # todo ask to SIA
-cidr_subnet_apim      = ["10.230.7.0/26"]
 
 # dns
 external_domain = "pagopa.it"

src/core/network.tf

@@ -16,32 +16,6 @@ module "vnet" {
   tags = var.tags
 }
 
-# vnet integration
-module "vnet_integration" {
-  source              = "git::https://github.com/pagopa/azurerm.git//virtual_network?ref=v1.0.58"
-  name                = format("%s-vnet-integration", local.project)
-  location            = azurerm_resource_group.rg_vnet.location
-  resource_group_name = azurerm_resource_group.rg_vnet.name
-  address_space       = var.cidr_vnet_integration
-
-  tags = var.tags
-}
-
-## Peering between the vnet(main) and integration vnet
-module "vnet_peering" {
-  source = "git::https://github.com/pagopa/azurerm.git//virtual_network_peering?ref=v1.0.58"
-
-  location = azurerm_resource_group.rg_vnet.location
-
-  source_resource_group_name       = azurerm_resource_group.rg_vnet.name
-  source_virtual_network_name      = module.vnet.name
-  source_remote_virtual_network_id = module.vnet.id
-  source_allow_gateway_transit     = true # needed by vpn gateway for enabling routing from vnet to vnet_integration
-  target_resource_group_name       = azurerm_resource_group.rg_vnet.name
-  target_virtual_network_name      = module.vnet_integration.name
-  target_remote_virtual_network_id = module.vnet_integration.id
-  target_use_remote_gateways       = false # needed by vnet peering with SIA
-}
 
 ## VPN subnet
 module "vpn_snet" {

src/core/outputs.tf

@@ -6,14 +6,6 @@ output "vnet_address_space" {
   value = module.vnet.address_space
 }
 
-output "vnet_integration_name" {
-  value = module.vnet_integration.name
-}
-
-output "vnet_integration_address_space" {
-  value = module.vnet_integration.address_space
-}
-
 ## Redis cache
 output "redis_primary_access_key" {
   value     = module.redis.primary_access_key

src/core/variables.tf

@@ -379,11 +379,6 @@ variable "cidr_vnet" {
   description = "Virtual network address space."
 }
 
-variable "cidr_vnet_integration" {
-  type        = list(string)
-  description = "Virtual network to peer with sia subscription. It should host apim"
-}
-
 variable "cidr_subnet_apim" {
   type        = list(string)
   description = "Address prefixes subnet api management."