From 69d607d099255cbcdae1041e3afcfb71a28f09aa Mon Sep 17 00:00:00 2001 From: Svein-Petter Johnsen <83902071+sveinpj@users.noreply.github.com> Date: Thu, 24 Oct 2024 12:51:54 +0200 Subject: [PATCH] Refactor Virtualnetwork (#1481) Co-authored-by: Automatic Update --- .../modules/network_publicipprefix/main.tf | 3 + .../modules/networksecuritygroup/main.tf | 33 ------ .../modules/networksecuritygroup/output.tf | 4 - .../modules/networksecuritygroup/variables.tf | 19 ---- .../subscriptions/modules/redis_cache/main.tf | 21 ++-- .../subscriptions/s940/c2/clusters/main.tf | 12 +-- .../s940/c2/clusters/variables.tf | 31 ------ .../subscriptions/s940/c2/common/main.tf | 60 +++++++++++ .../subscriptions/s940/c2/common/variables.tf | 5 + .../c2/virtualnetwork/.terraform.lock.hcl | 45 -------- .../s940/c2/virtualnetwork/backend.tf | 28 ----- .../s940/c2/virtualnetwork/main.tf | 58 ---------- .../s940/c2/virtualnetwork/variables.tf | 9 -- .../s940/extmon/clusters/main.tf | 3 +- .../s940/extmon/clusters/variables.tf | 31 ------ .../subscriptions/s940/extmon/common/main.tf | 58 ++++++++++ .../extmon/virtualnetwork/.terraform.lock.hcl | 22 ---- .../s940/extmon/virtualnetwork/backend.tf | 24 ----- .../s940/extmon/virtualnetwork/main.tf | 57 ---------- .../s940/extmon/virtualnetwork/variables.tf | 4 - .../subscriptions/s940/prod/clusters/main.tf | 12 +-- .../s940/prod/clusters/variables.tf | 31 ------ .../s940/prod/common/.terraform.lock.hcl | 22 ++++ .../subscriptions/s940/prod/common/main.tf | 100 ++++++++++++++++++ .../s940/prod/common/variables.tf | 5 + .../prod/virtualnetwork/.terraform.lock.hcl | 45 -------- .../s940/prod/virtualnetwork/backend.tf | 27 ----- .../s940/prod/virtualnetwork/main.tf | 99 ----------------- .../s940/prod/virtualnetwork/variables.tf | 9 -- .../subscriptions/s941/dev/clusters/main.tf | 12 +-- .../s941/dev/clusters/variables.tf | 30 ------ .../subscriptions/s941/dev/common/main.tf | 58 ++++++++++ .../s941/dev/common/variables.tf | 10 ++ .../dev/virtualnetwork/.terraform.lock.hcl | 45 -------- .../s941/dev/virtualnetwork/backend.tf | 28 ----- .../s941/dev/virtualnetwork/input.tf | 10 -- .../s941/dev/virtualnetwork/main.tf | 57 ---------- .../s941/dev/virtualnetwork/variables.tf | 14 --- .../s941/playground/clusters/main.tf | 12 +-- .../s941/playground/clusters/variables.tf | 31 ------ .../playground/common/.terraform.lock.hcl | 22 ++++ .../s941/playground/common/main.tf | 58 ++++++++++ .../s941/playground/common/variables.tf | 5 + .../virtualnetwork/.terraform.lock.hcl | 45 -------- .../s941/playground/virtualnetwork/backend.tf | 28 ----- .../s941/playground/virtualnetwork/input.tf | 10 -- .../s941/playground/virtualnetwork/main.tf | 57 ---------- .../playground/virtualnetwork/variables.tf | 9 -- 48 files changed, 422 insertions(+), 996 deletions(-) delete mode 100644 terraform/subscriptions/modules/networksecuritygroup/main.tf delete mode 100644 terraform/subscriptions/modules/networksecuritygroup/output.tf delete mode 100644 terraform/subscriptions/modules/networksecuritygroup/variables.tf delete mode 100644 terraform/subscriptions/s940/c2/virtualnetwork/.terraform.lock.hcl delete mode 100644 terraform/subscriptions/s940/c2/virtualnetwork/backend.tf delete mode 100644 terraform/subscriptions/s940/c2/virtualnetwork/main.tf delete mode 100644 terraform/subscriptions/s940/c2/virtualnetwork/variables.tf delete mode 100644 terraform/subscriptions/s940/extmon/virtualnetwork/.terraform.lock.hcl delete mode 100644 terraform/subscriptions/s940/extmon/virtualnetwork/backend.tf delete mode 100644 terraform/subscriptions/s940/extmon/virtualnetwork/main.tf delete mode 100644 terraform/subscriptions/s940/extmon/virtualnetwork/variables.tf delete mode 100644 terraform/subscriptions/s940/prod/virtualnetwork/.terraform.lock.hcl delete mode 100644 terraform/subscriptions/s940/prod/virtualnetwork/backend.tf delete mode 100644 terraform/subscriptions/s940/prod/virtualnetwork/main.tf delete mode 100644 terraform/subscriptions/s940/prod/virtualnetwork/variables.tf delete mode 100644 terraform/subscriptions/s941/dev/virtualnetwork/.terraform.lock.hcl delete mode 100644 terraform/subscriptions/s941/dev/virtualnetwork/backend.tf delete mode 100644 terraform/subscriptions/s941/dev/virtualnetwork/input.tf delete mode 100644 terraform/subscriptions/s941/dev/virtualnetwork/main.tf delete mode 100644 terraform/subscriptions/s941/dev/virtualnetwork/variables.tf delete mode 100644 terraform/subscriptions/s941/playground/virtualnetwork/.terraform.lock.hcl delete mode 100644 terraform/subscriptions/s941/playground/virtualnetwork/backend.tf delete mode 100644 terraform/subscriptions/s941/playground/virtualnetwork/input.tf delete mode 100644 terraform/subscriptions/s941/playground/virtualnetwork/main.tf delete mode 100644 terraform/subscriptions/s941/playground/virtualnetwork/variables.tf diff --git a/terraform/subscriptions/modules/network_publicipprefix/main.tf b/terraform/subscriptions/modules/network_publicipprefix/main.tf index 023e05912..fdc7c413f 100644 --- a/terraform/subscriptions/modules/network_publicipprefix/main.tf +++ b/terraform/subscriptions/modules/network_publicipprefix/main.tf @@ -12,6 +12,9 @@ resource "azurerm_public_ip_prefix" "publicipprefix" { tags = { IaC = "terraform" } + lifecycle { + prevent_destroy = true + } } resource "azurerm_public_ip" "this" { diff --git a/terraform/subscriptions/modules/networksecuritygroup/main.tf b/terraform/subscriptions/modules/networksecuritygroup/main.tf deleted file mode 100644 index 74c37e9ff..000000000 --- a/terraform/subscriptions/modules/networksecuritygroup/main.tf +++ /dev/null @@ -1,33 +0,0 @@ -resource "azurerm_network_security_group" "networksecuritygroup" { - name = var.networksecuritygroupname - location = var.location - resource_group_name = var.resource_group_name - tags = { - IaC = "terraform" - } - - security_rule = [ - { - access = "Allow" - description = "" - destination_address_prefix = var.destination_address_prefix - destination_address_prefixes = [] - destination_application_security_group_ids = [] - destination_port_range = "" - destination_port_ranges = [ - "443", - "80", - ] - direction = "Inbound" - name = "${var.networksecuritygroupname}-rule" - priority = 100 - protocol = "Tcp" - source_address_prefix = "*" - source_address_prefixes = [] - source_application_security_group_ids = [] - source_port_range = "*" - source_port_ranges = [] - } - ] - -} diff --git a/terraform/subscriptions/modules/networksecuritygroup/output.tf b/terraform/subscriptions/modules/networksecuritygroup/output.tf deleted file mode 100644 index d0110ffee..000000000 --- a/terraform/subscriptions/modules/networksecuritygroup/output.tf +++ /dev/null @@ -1,4 +0,0 @@ -output "data" { - description = "Networks securitygroup" - value = azurerm_network_security_group.networksecuritygroup -} \ No newline at end of file diff --git a/terraform/subscriptions/modules/networksecuritygroup/variables.tf b/terraform/subscriptions/modules/networksecuritygroup/variables.tf deleted file mode 100644 index a1a5c78f2..000000000 --- a/terraform/subscriptions/modules/networksecuritygroup/variables.tf +++ /dev/null @@ -1,19 +0,0 @@ -variable "resource_group_name" { - description = "The name of the resource group in which to create the network security group" - type = string -} - -variable "location" { - description = "Specifies the supported Azure location where the resource exists" - type = string -} - -variable "networksecuritygroupname" { - description = "Specifies the name of the network security group" - type = string -} - -variable "destination_address_prefix" { - description = "List of destination address prefixes." - type = string -} \ No newline at end of file diff --git a/terraform/subscriptions/modules/redis_cache/main.tf b/terraform/subscriptions/modules/redis_cache/main.tf index f89f0bc2c..b0a1cae81 100644 --- a/terraform/subscriptions/modules/redis_cache/main.tf +++ b/terraform/subscriptions/modules/redis_cache/main.tf @@ -1,18 +1,19 @@ resource "azurerm_redis_cache" "this" { - for_each = toset(["qa", "prod"]) - name = "${var.name}-${each.key}" - location = var.location - resource_group_name = var.rg_name - capacity = 1 - family = "C" - sku_name = var.sku_name - minimum_tls_version = "1.2" + for_each = toset(["qa", "prod"]) + name = "${var.name}-${each.key}" + location = var.location + resource_group_name = var.rg_name + capacity = 1 + family = "C" + sku_name = var.sku_name + minimum_tls_version = "1.2" + public_network_access_enabled = false redis_configuration { maxmemory_reserved = 125 maxmemory_delta = 125 maxfragmentationmemory_reserved = 125 - data_persistence_authentication_method = "SAS" - maxmemory_policy = "volatile-lru" + # data_persistence_authentication_method = "SAS" + maxmemory_policy = "volatile-lru" } } \ No newline at end of file diff --git a/terraform/subscriptions/s940/c2/clusters/main.tf b/terraform/subscriptions/s940/c2/clusters/main.tf index 00e5c1f6f..0b2bb4942 100644 --- a/terraform/subscriptions/s940/c2/clusters/main.tf +++ b/terraform/subscriptions/s940/c2/clusters/main.tf @@ -3,9 +3,8 @@ module "config" { } module "resourcegroups" { - for_each = toset(var.resource_groups) source = "../../../modules/resourcegroups" - name = each.value + name = module.config.cluster_resource_group location = module.config.location } @@ -147,15 +146,6 @@ module "radix_id_velero_mi" { } } -module "nsg" { - source = "../../../modules/networksecuritygroup" - for_each = local.flattened_clusters - networksecuritygroupname = "nsg-${each.key}" - location = each.value.location - resource_group_name = each.value.resource_group_name - destination_address_prefix = each.value.destination_address_prefix -} - output "radix_id_aks_mi_id" { value = module.radix_id_aks_mi.data.id } diff --git a/terraform/subscriptions/s940/c2/clusters/variables.tf b/terraform/subscriptions/s940/c2/clusters/variables.tf index a7b09f272..e69de29bb 100644 --- a/terraform/subscriptions/s940/c2/clusters/variables.tf +++ b/terraform/subscriptions/s940/c2/clusters/variables.tf @@ -1,31 +0,0 @@ -locals { - flattened_clusters = { - for key, value in var.clusters : key => { - name = key - resource_group_name = value.resource_group_name - location = value.location - destination_address_prefix = value.destination_address_prefix - } - } -} - -variable "resource_groups" { - type = list(string) - default = ["clusters-c2"] -} - -variable "clusters" { - type = map(object({ - resource_group_name = optional(string, "clusters") - location = optional(string, "northeurope") - destination_address_prefix = string - })) - default = { - # weekly-52 = { - # destination_address_prefix = "20.223.40.149" - # } - # weekly-01 = { - # destination_address_prefix = "20.223.40.148" - # } - } -} \ No newline at end of file diff --git a/terraform/subscriptions/s940/c2/common/main.tf b/terraform/subscriptions/s940/c2/common/main.tf index 3f36bb6aa..a2d63b45d 100644 --- a/terraform/subscriptions/s940/c2/common/main.tf +++ b/terraform/subscriptions/s940/c2/common/main.tf @@ -2,6 +2,66 @@ module "config" { source = "../../../modules/config" } +###Migrated from 'Virtualnetwork' start + +module "vnet_resourcegroup" { + source = "../../../modules/resourcegroups" + name = module.config.vnet_resource_group + location = module.config.location +} + +module "azurerm_virtual_network" { + source = "../../../modules/virtualnetwork" + location = module.config.location + enviroment = module.config.environment + vnet_resource_group = module.vnet_resourcegroup.data.name + private_dns_zones = tolist(module.config.private_dns_zones_names) + depends_on = [module.vnet_resourcegroup] + +} + +module "azurerm_public_ip_prefix_ingress" { + source = "../../../modules/network_publicipprefix" + location = module.config.location + resource_group_name = var.resource_groups_common_temporary #TODO + publicipprefixname = "ippre-ingress-radix-aks-${module.config.environment}-prod-001" #TODO + pipprefix = "ingress-radix-aks" + pippostfix = "prod" + enviroment = module.config.environment + prefix_length = 29 + publicipcounter = 8 + # zones = ["1", "2", "3"] +} + +module "azurerm_public_ip_prefix_egress" { + source = "../../../modules/network_publicipprefix" + location = module.config.location + resource_group_name = var.resource_groups_common_temporary #TODO + publicipprefixname = "ippre-egress-radix-aks-${module.config.environment}-prod-001" #TODO + pipprefix = "egress-radix-aks" + pippostfix = "prod" + enviroment = module.config.environment + prefix_length = 29 + publicipcounter = 8 +} + +output "vnet_hub_id" { + value = module.azurerm_virtual_network.data.vnet_hub.id +} + +output "vnet_subnet_id" { + value = module.azurerm_virtual_network.data.vnet_subnet.id +} + +output "public_ip_prefix_ids" { + value = { + egress_id = module.azurerm_public_ip_prefix_egress.data.id + ingress_id = module.azurerm_public_ip_prefix_ingress.data.id + } +} + +###Migrated from 'Virtualnetwork' end + module "resourcegroups" { source = "../../../modules/resourcegroups" name = module.config.common_resource_group diff --git a/terraform/subscriptions/s940/c2/common/variables.tf b/terraform/subscriptions/s940/c2/common/variables.tf index b6a9f9ba4..d63f800cc 100644 --- a/terraform/subscriptions/s940/c2/common/variables.tf +++ b/terraform/subscriptions/s940/c2/common/variables.tf @@ -28,4 +28,9 @@ variable "storageaccounts" { lifecyclepolicy = true } } +} + +variable "resource_groups_common_temporary" { + type = string + default = "common-westeurope" } \ No newline at end of file diff --git a/terraform/subscriptions/s940/c2/virtualnetwork/.terraform.lock.hcl b/terraform/subscriptions/s940/c2/virtualnetwork/.terraform.lock.hcl deleted file mode 100644 index 11386128e..000000000 --- a/terraform/subscriptions/s940/c2/virtualnetwork/.terraform.lock.hcl +++ /dev/null @@ -1,45 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/hashicorp/azurerm" { - version = "3.113.0" - constraints = ">= 3.110.0" - hashes = [ - "h1:eEUtt0lrLdpVaF6FiDq8BGQPgEcykmhj0aNIL7hTOGw=", - "zh:12479f5664288943400447b55e50df675c28ae82ad8d373cc2e5682f3a3411f0", - "zh:1b42a14e80e568429d3b55fed753ca3ef0df9dcdfa107890d7264599c020940f", - "zh:381be6ca617f848de3baa3985a6e1788e91a803afe04a3c5c727453528b6310d", - "zh:3e70e2e07b6db1c363de3e5d0ca47f27fc956473df03329c7d2e54d3ac29176b", - "zh:87c7633aeaa828098c6055da9e67d4acaf4b46748b6b3f0267e105e55f05de25", - "zh:8d0d98226901f874770dd5220d4701a12ae8bd586994615aa7dcba12b9736bec", - "zh:9fd913acd42a60c3a90a18ce803567ef861db8779a59aacced91f2cbd86de9d9", - "zh:b6f3f7ae0a055437fb36c139af9bb3135e7f4dad172157ae1eb0177dc74d703f", - "zh:b927027ba2bf40d34e03d742fd2b6c5299023b5ab8e6f05e50aac76a46ad1094", - "zh:ceb5187b9d2a439f4e48944f3ffeeeaf47a03dbe6f3325ea1775bf659ce0aa88", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fb9d78dfeca7489bffca9b1a1f3abee7f16dbbcba31388aea1102062c1d6dce8", - ] -} - -provider "registry.terraform.io/integrations/github" { - version = "6.3.0" - constraints = "~> 6.0" - hashes = [ - "h1:LEs8NwSWwYGHxmbJvGT1w3XeAM6pogAmskY8XavuWDs=", - "zh:04fe3b820fe8c247b98b9d6810b8bb84d3e8ac08054faf450c42489815ef4bfa", - "zh:24096b2d16208d1411a58bdb8df8cd9f0558fb9054ffeb95c4e7e90a9a34f976", - "zh:2b27332adf8d08fbdc08b5f55e87691bce02c311219e6deb39c08753bd93db6d", - "zh:335dd6c2d50fcdce2ef0cc194465fdf9df1f5fdecc805804c78df30a4eb2e11e", - "zh:383a6879565969dbdf5405b651cd870c09c615dbd3df2554e5574d39d161c98c", - "zh:4903038a6bc605f372e1569695db4a2e2862e1fc6cf4faf9e13c5f8f4fa2ed94", - "zh:4cc4dffbee8b28102d38abe855b7440d4f4226261b43fda2ec289b48c3de1537", - "zh:57c30c6fe0b64fa86906700ceb1691562b62f2b1ef0404952aeb4092acb6acb3", - "zh:7bf518396fb00e4f55c406f2ffb5583b43278682a92f0864a0c47e3a74627bbb", - "zh:93c2c5cb90f74ad3c0874b7f7d8a866f28a852f0eda736c6aef8ce65d4061f4d", - "zh:9562a82a6193a2db110fb34d1aceeedb27c0a640058dce9c31b37b17eeb5f4e7", - "zh:ac97f2d111703a219f27fcbf5e89460ea98f9168badcc0913c8b214a37f76814", - "zh:c882af4d33b761ec198cedac212ab1c114d97540119dc97daca38021ab3edd0a", - "zh:c9ffd0a37f07a93af02a1caa90bfbea27a952d3e5badf4aab866ec71cdb184a3", - "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25", - ] -} diff --git a/terraform/subscriptions/s940/c2/virtualnetwork/backend.tf b/terraform/subscriptions/s940/c2/virtualnetwork/backend.tf deleted file mode 100644 index fb9f5d2de..000000000 --- a/terraform/subscriptions/s940/c2/virtualnetwork/backend.tf +++ /dev/null @@ -1,28 +0,0 @@ -terraform { - required_providers { - azurerm = { - source = "hashicorp/azurerm" - version = ">=3.110.0" - } - github = { - source = "integrations/github" - version = "~> 6.0" - } - } - - backend "azurerm" { - tenant_id = "3aa4a235-b6e2-48d5-9195-7fcf05b459b0" - subscription_id = "ded7ca41-37c8-4085-862f-b11d21ab341a" - resource_group_name = "s940-tfstate" - storage_account_name = "s940radixinfra" - container_name = "infrastructure" - key = "c2/virtualnetwork/terraform.tfstate" - use_azuread_auth = true # This enables RBAC instead of access keys - } -} - -provider "azurerm" { - subscription_id = "ded7ca41-37c8-4085-862f-b11d21ab341a" - features { - } -} diff --git a/terraform/subscriptions/s940/c2/virtualnetwork/main.tf b/terraform/subscriptions/s940/c2/virtualnetwork/main.tf deleted file mode 100644 index 2932855ab..000000000 --- a/terraform/subscriptions/s940/c2/virtualnetwork/main.tf +++ /dev/null @@ -1,58 +0,0 @@ -module "config" { - source = "../../../modules/config" -} -module "resourcegroups" { - source = "../../../modules/resourcegroups" - name = module.config.vnet_resource_group - location = module.config.location -} - -module "azurerm_virtual_network" { - source = "../../../modules/virtualnetwork" - location = module.config.location - enviroment = module.config.environment - vnet_resource_group = module.resourcegroups.data.name - private_dns_zones = tolist(module.config.private_dns_zones_names) - depends_on = [module.resourcegroups] - -} - -module "azurerm_public_ip_prefix_ingress" { - source = "../../../modules/network_publicipprefix" - location = module.config.location - resource_group_name = var.resource_groups_common_temporary #TODO - publicipprefixname = "ippre-ingress-radix-aks-${module.config.environment}-prod-001" #TODO - pipprefix = "ingress-radix-aks" - pippostfix = "prod" - enviroment = module.config.environment - prefix_length = 29 - publicipcounter = 8 - # zones = ["1", "2", "3"] -} - -module "azurerm_public_ip_prefix_egress" { - source = "../../../modules/network_publicipprefix" - location = module.config.location - resource_group_name = var.resource_groups_common_temporary #TODO - publicipprefixname = "ippre-egress-radix-aks-${module.config.environment}-prod-001" #TODO - pipprefix = "egress-radix-aks" - pippostfix = "prod" - enviroment = module.config.environment - prefix_length = 29 - publicipcounter = 8 -} - -output "vnet_hub_id" { - value = module.azurerm_virtual_network.data.vnet_hub.id -} - -output "vnet_subnet_id" { - value = module.azurerm_virtual_network.data.vnet_subnet.id -} - -output "public_ip_prefix_ids" { - value = { - egress_id = module.azurerm_public_ip_prefix_egress.data.id - ingress_id = module.azurerm_public_ip_prefix_ingress.data.id - } -} diff --git a/terraform/subscriptions/s940/c2/virtualnetwork/variables.tf b/terraform/subscriptions/s940/c2/virtualnetwork/variables.tf deleted file mode 100644 index b3df12577..000000000 --- a/terraform/subscriptions/s940/c2/virtualnetwork/variables.tf +++ /dev/null @@ -1,9 +0,0 @@ -variable "resource_groups" { - type = list(string) - default = ["cluster-vnet-hub"] -} - -variable "resource_groups_common_temporary" { - type = string - default = "common-westeurope" -} diff --git a/terraform/subscriptions/s940/extmon/clusters/main.tf b/terraform/subscriptions/s940/extmon/clusters/main.tf index 401c15afe..dd1a83e93 100644 --- a/terraform/subscriptions/s940/extmon/clusters/main.tf +++ b/terraform/subscriptions/s940/extmon/clusters/main.tf @@ -5,9 +5,8 @@ module "config" { } module "resourcegroups" { - for_each = toset(var.resource_groups) source = "../../../modules/resourcegroups" - name = each.value + name = module.config.cluster_resource_group location = module.config.location } diff --git a/terraform/subscriptions/s940/extmon/clusters/variables.tf b/terraform/subscriptions/s940/extmon/clusters/variables.tf index 8457c3dd8..e69de29bb 100644 --- a/terraform/subscriptions/s940/extmon/clusters/variables.tf +++ b/terraform/subscriptions/s940/extmon/clusters/variables.tf @@ -1,31 +0,0 @@ -locals { - flattened_clusters = { - for key, value in var.clusters : key => { - name = key - resource_group_name = value.resource_group_name - location = value.location - destination_address_prefix = value.destination_address_prefix - } - } -} - -variable "resource_groups" { - type = list(string) - default = ["clusters-extmon"] -} - -variable "clusters" { - type = map(object({ - resource_group_name = optional(string, "clusters-extmon") - location = optional(string, "northeurope") - destination_address_prefix = string - })) - default = { - # weekly-52 = { - # destination_address_prefix = "20.223.40.149" - # } - # weekly-01 = { - # destination_address_prefix = "20.223.40.148" - # } - } -} \ No newline at end of file diff --git a/terraform/subscriptions/s940/extmon/common/main.tf b/terraform/subscriptions/s940/extmon/common/main.tf index 94c50873c..fcd9dc8a0 100644 --- a/terraform/subscriptions/s940/extmon/common/main.tf +++ b/terraform/subscriptions/s940/extmon/common/main.tf @@ -2,6 +2,64 @@ module "config" { source = "../../../modules/config" } +###Migrated from 'Virtualnetwork' start + +module "vnet_resourcegroup" { + source = "../../../modules/resourcegroups" + name = module.config.vnet_resource_group + location = module.config.location +} + +module "azurerm_virtual_network" { + source = "../../../modules/virtualnetwork" + location = module.config.location + enviroment = module.config.environment + vnet_resource_group = module.vnet_resourcegroup.data.name + private_dns_zones = tolist(module.config.private_dns_zones_names) + depends_on = [module.vnet_resourcegroup] +} + +module "azurerm_public_ip_prefix_ingress" { + source = "../../../modules/network_publicipprefix" + location = module.config.location + resource_group_name = module.config.cluster_resource_group + publicipprefixname = "ippre-ingress-radix-aks-${module.config.environment}-${module.config.location}-001" + pipprefix = "ingress-radix-aks" + pippostfix = module.config.location + enviroment = module.config.environment + prefix_length = 30 + # zones = ["1", "2", "3"] +} + +module "azurerm_public_ip_prefix_egress" { + source = "../../../modules/network_publicipprefix" + location = module.config.location + resource_group_name = module.config.cluster_resource_group + publicipprefixname = "ippre-radix-aks-${module.config.environment}-northeurope-001" + pipprefix = "radix-aks" + pippostfix = module.config.location + enviroment = module.config.environment + prefix_length = 30 +} + + +output "vnet_hub_id" { + value = module.azurerm_virtual_network.data.vnet_hub.id +} + +output "vnet_subnet_id" { + value = module.azurerm_virtual_network.data.vnet_subnet.id +} + +output "public_ip_prefix_ids" { + value = { + egress_id = module.azurerm_public_ip_prefix_egress.data.id + ingress_id = module.azurerm_public_ip_prefix_ingress.data.id + } +} + +###Migrated from 'Virtualnetwork' end + module "resourcegroups" { source = "../../../modules/resourcegroups" name = module.config.common_resource_group diff --git a/terraform/subscriptions/s940/extmon/virtualnetwork/.terraform.lock.hcl b/terraform/subscriptions/s940/extmon/virtualnetwork/.terraform.lock.hcl deleted file mode 100644 index 63f94f4e2..000000000 --- a/terraform/subscriptions/s940/extmon/virtualnetwork/.terraform.lock.hcl +++ /dev/null @@ -1,22 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/hashicorp/azurerm" { - version = "3.100.0" - constraints = "<= 3.100.0" - hashes = [ - "h1:/3X1KgoKBqJo0xe3XDUD0fxfqUK+0Fn8SghwvwY+BIA=", - "zh:20c3259fd94ab41c6c3425fb428d8bd279addb755c8ea1fe0b3e1c3bea4363cb", - "zh:4c4a8d5dbd8a9d7b60934b0ffed442fe50ab1b0559b9693399e3f66eca53d045", - "zh:7c21f569b839e40d4976beb6143adaccc5688d1a754dde054cb6f19ca33576b2", - "zh:88042b599de9ff8ec200e26636e06682e024a28331c4c48db8589d6a03279a8a", - "zh:95c20834eee3b46a85e338988bf14a9a70f74f9cae45ec934cf157dedaa40f28", - "zh:beeed81f4483dec0b64bf1aaf611c5030ad6e4c88c4bd75f956835653a1a29c0", - "zh:d76fa7371648b5bdc17115b5e42fa616fe4c6d2998f727a0956c0bddc4842365", - "zh:d89fcaa83a1ff7c9f29c49b31c60c29d8a84486e11d34573d767a5cd208da7d8", - "zh:ddbe18aee99fb7e2c93343f7f8a95837461a047ca660553c88c873761205ed76", - "zh:e6e70c7635bb4472810bfd0a31949640e72c535e6e8707454ea7e86dcb5fcd89", - "zh:f0575689ce28e220bc8daa4d2fefbfd90afde01a14343c61dfd6489960e22ff4", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - ] -} diff --git a/terraform/subscriptions/s940/extmon/virtualnetwork/backend.tf b/terraform/subscriptions/s940/extmon/virtualnetwork/backend.tf deleted file mode 100644 index f46d7d28f..000000000 --- a/terraform/subscriptions/s940/extmon/virtualnetwork/backend.tf +++ /dev/null @@ -1,24 +0,0 @@ -terraform { - required_providers { - azurerm = { - source = "hashicorp/azurerm" - version = ">=3.110.0" - } - } - - backend "azurerm" { - tenant_id = "3aa4a235-b6e2-48d5-9195-7fcf05b459b0" - subscription_id = "ded7ca41-37c8-4085-862f-b11d21ab341a" - resource_group_name = "s940-tfstate" - storage_account_name = "s940radixinfra" - container_name = "infrastructure" - key = "extmon/virtualnetwork/terraform.tfstate" - use_azuread_auth = true # This enables RBAC instead of access keys - } -} - -provider "azurerm" { - subscription_id = "ded7ca41-37c8-4085-862f-b11d21ab341a" - features { - } -} diff --git a/terraform/subscriptions/s940/extmon/virtualnetwork/main.tf b/terraform/subscriptions/s940/extmon/virtualnetwork/main.tf deleted file mode 100644 index d850178a2..000000000 --- a/terraform/subscriptions/s940/extmon/virtualnetwork/main.tf +++ /dev/null @@ -1,57 +0,0 @@ -module "config" { - source = "../../../modules/config" -} - -module "resourcegroups" { - source = "../../../modules/resourcegroups" - name = module.config.vnet_resource_group - location = module.config.location -} - -module "azurerm_virtual_network" { - source = "../../../modules/virtualnetwork" - location = module.config.location - enviroment = module.config.environment - vnet_resource_group = module.resourcegroups.data.name - private_dns_zones = tolist(module.config.private_dns_zones_names) - depends_on = [module.resourcegroups] -} - -module "azurerm_public_ip_prefix_ingress" { - source = "../../../modules/network_publicipprefix" - location = module.config.location - resource_group_name = module.config.cluster_resource_group - publicipprefixname = "ippre-ingress-radix-aks-${module.config.environment}-${module.config.location}-001" - pipprefix = "ingress-radix-aks" - pippostfix = module.config.location - enviroment = module.config.environment - prefix_length = 30 - # zones = ["1", "2", "3"] -} - -module "azurerm_public_ip_prefix_egress" { - source = "../../../modules/network_publicipprefix" - location = module.config.location - resource_group_name = module.config.cluster_resource_group - publicipprefixname = "ippre-radix-aks-${module.config.environment}-northeurope-001" - pipprefix = "radix-aks" - pippostfix = module.config.location - enviroment = module.config.environment - prefix_length = 30 -} - - -output "vnet_hub_id" { - value = module.azurerm_virtual_network.data.vnet_hub.id -} - -output "vnet_subnet_id" { - value = module.azurerm_virtual_network.data.vnet_subnet.id -} - -output "public_ip_prefix_ids" { - value = { - egress_id = module.azurerm_public_ip_prefix_egress.data.id - ingress_id = module.azurerm_public_ip_prefix_ingress.data.id - } -} diff --git a/terraform/subscriptions/s940/extmon/virtualnetwork/variables.tf b/terraform/subscriptions/s940/extmon/virtualnetwork/variables.tf deleted file mode 100644 index d7a1b1107..000000000 --- a/terraform/subscriptions/s940/extmon/virtualnetwork/variables.tf +++ /dev/null @@ -1,4 +0,0 @@ -variable "resource_groups" { - type = list(string) - default = ["cluster-vnet-hub"] -} \ No newline at end of file diff --git a/terraform/subscriptions/s940/prod/clusters/main.tf b/terraform/subscriptions/s940/prod/clusters/main.tf index a28272182..419472f22 100644 --- a/terraform/subscriptions/s940/prod/clusters/main.tf +++ b/terraform/subscriptions/s940/prod/clusters/main.tf @@ -5,9 +5,8 @@ module "config" { } module "resourcegroups" { - for_each = toset(var.resource_groups) source = "../../../modules/resourcegroups" - name = each.value + name = module.config.cluster_resource_group location = module.config.location } @@ -154,15 +153,6 @@ module "radix_id_velero_mi" { } } -module "nsg" { - source = "../../../modules/networksecuritygroup" - for_each = local.flattened_clusters - networksecuritygroupname = "nsg-${each.key}" - location = each.value.location - resource_group_name = each.value.resource_group_name - destination_address_prefix = each.value.destination_address_prefix -} - output "radix_id_aks_mi_id" { value = module.radix_id_aks_mi.data.id } diff --git a/terraform/subscriptions/s940/prod/clusters/variables.tf b/terraform/subscriptions/s940/prod/clusters/variables.tf index a03d5e986..e69de29bb 100644 --- a/terraform/subscriptions/s940/prod/clusters/variables.tf +++ b/terraform/subscriptions/s940/prod/clusters/variables.tf @@ -1,31 +0,0 @@ -locals { - flattened_clusters = { - for key, value in var.clusters : key => { - name = key - resource_group_name = value.resource_group_name - location = value.location - destination_address_prefix = value.destination_address_prefix - } - } -} - -variable "resource_groups" { - type = list(string) - default = ["clusters-platform"] -} - -variable "clusters" { - type = map(object({ - resource_group_name = optional(string, "clusters") - location = optional(string, "northeurope") - destination_address_prefix = string - })) - default = { - # weekly-52 = { - # destination_address_prefix = "20.223.40.149" - # } - # weekly-01 = { - # destination_address_prefix = "20.223.40.148" - # } - } -} \ No newline at end of file diff --git a/terraform/subscriptions/s940/prod/common/.terraform.lock.hcl b/terraform/subscriptions/s940/prod/common/.terraform.lock.hcl index d00455506..2ee43a0f3 100644 --- a/terraform/subscriptions/s940/prod/common/.terraform.lock.hcl +++ b/terraform/subscriptions/s940/prod/common/.terraform.lock.hcl @@ -41,3 +41,25 @@ provider "registry.terraform.io/hashicorp/azurerm" { "zh:fb9d78dfeca7489bffca9b1a1f3abee7f16dbbcba31388aea1102062c1d6dce8", ] } + +provider "registry.terraform.io/integrations/github" { + version = "6.3.1" + hashes = [ + "h1:kNCbU7jr9j09hqWwyXGFDN95Un28gWO2kY2yImv1MDY=", + "zh:25ae1cb97ec528e6b7e9330489f4a33acc0fa80b909c113a8445656bc524c5b9", + "zh:3e1f6300dc10e52a54f13352770ed79f25ff4ba9ac49b776c52a655a3488a20b", + "zh:4aaf2877ec22e63358d7c9cd48c7d7947d1a1dc4d03231f0af193d8975d5918a", + "zh:4b904a81fac12a2a7606c8d811cb9c4e13581adcaaa19e503a067ac95c515925", + "zh:54fe7e0dca04e698631a5b86bdd43ef09a31375e68f8f89970b4315cd5fc6312", + "zh:6b14f92cf62784eaf20f43ef58ce966735f30d43deeab077943bd410c0d8b8b2", + "zh:86c49a1c11c024b26b6750c446f104922a3fe8464d3706a5fb9a4a05c6ca0b0a", + "zh:8939fb6332c4a58c4e90245eb9f0110987ccafff06b45a7ed513f2759a2abe6a", + "zh:8b4068a78c1f357325d1151facdb1aff506b9cd79d2bab21a55651255a130e2f", + "zh:ae22f5e52f534f19811d7f9480b4eb442f12ff16367b3893abb4e449b029ff6b", + "zh:afae9cfd9d49002ddfea552aa4844074b9974bd56ff2c2458f2297fe0df56a5b", + "zh:bc7a434408eb16a4fbceec0bd86b108a491408b727071402ad572cdb1afa2eb7", + "zh:c8e4728ea2d2c6e3d2c1bc5e7d92ed1121c02bab687702ec2748e3a6a0844150", + "zh:f6314b2cff0c0a07a216501cda51b35e6a4c66a2418c7c9966ccfe701e01b6b0", + "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25", + ] +} diff --git a/terraform/subscriptions/s940/prod/common/main.tf b/terraform/subscriptions/s940/prod/common/main.tf index 6a8481c88..f16ffb367 100644 --- a/terraform/subscriptions/s940/prod/common/main.tf +++ b/terraform/subscriptions/s940/prod/common/main.tf @@ -2,6 +2,106 @@ module "config" { source = "../../../modules/config" } +###Migrated from 'Virtualnetwork' start + +module "vnet_resourcegroup" { + source = "../../../modules/resourcegroups" + name = module.config.vnet_resource_group + location = module.config.location +} + +module "azurerm_virtual_network" { + source = "../../../modules/virtualnetwork" + location = module.config.location + enviroment = "prod" #TODO + vnet_resource_group = module.vnet_resourcegroup.data.name + private_dns_zones = tolist(module.config.private_dns_zones_names) + depends_on = [module.vnet_resourcegroup] +} + +module "azurerm_public_ip_prefix_ingress" { + source = "../../../modules/network_publicipprefix" + location = module.config.location + resource_group_name = var.resource_groups_common_temporary #TODO + publicipprefixname = "ippre-ingress-radix-aks-production-${module.config.location}-001" #TODO + pipprefix = "ingress-radix-aks" + pippostfix = module.config.location + enviroment = "production" + prefix_length = 29 + publicipcounter = 4 + zones = ["1", "2", "3"] +} + +module "azurerm_public_ip_prefix_egress" { + source = "../../../modules/network_publicipprefix" + location = module.config.location + resource_group_name = var.resource_groups_common_temporary #TODO + publicipprefixname = "ippre-radix-aks-production-${module.config.location}-001" #TODO + pipprefix = "radix-aks" + pippostfix = module.config.location + enviroment = "production" + prefix_length = 29 + publicipcounter = 8 +} + +################################################################################################## +### This block are reserved to new network when Cluster are migrated to platform resources group +### + +module "azurerm_virtual_network_platform" { + source = "../../../modules/virtualnetwork" + location = module.config.location + enviroment = module.config.environment + vnet_resource_group = "cluster-vnet-hub-platform" + private_dns_zones = tolist(module.config.private_dns_zones_names) + depends_on = [module.vnet_resourcegroup] +} + +module "azurerm_public_ip_prefix_ingress_platform" { + source = "../../../modules/network_publicipprefix" + location = module.config.location + resource_group_name = module.config.common_resource_group + publicipprefixname = "ippre-ingress-radix-aks-platform-${module.config.location}-001" #TODO + pipprefix = "ingress-radix-aks" + pippostfix = module.config.location + enviroment = "platform" + prefix_length = 29 + publicipcounter = 8 + zones = ["1", "2", "3"] +} + +module "azurerm_public_ip_prefix_egress_platform" { + source = "../../../modules/network_publicipprefix" + location = module.config.location + resource_group_name = module.config.common_resource_group + publicipprefixname = "ippre-radix-aks-platform-${module.config.location}-001" #TODO + pipprefix = "radix-aks" + pippostfix = module.config.location + enviroment = "platform" + prefix_length = 28 + publicipcounter = 16 +} + +################################################################################################## + + +output "vnet_hub_id" { + value = module.azurerm_virtual_network.data.vnet_hub.id +} + +output "vnet_subnet_id" { + value = module.azurerm_virtual_network.data.vnet_subnet.id +} + +output "public_ip_prefix_ids" { + value = { + egress_id = module.azurerm_public_ip_prefix_egress.data.id + ingress_id = module.azurerm_public_ip_prefix_ingress.data.id + } +} + +###Migrated from 'Virtualnetwork' end + module "resourcegroups" { source = "../../../modules/resourcegroups" name = module.config.common_resource_group diff --git a/terraform/subscriptions/s940/prod/common/variables.tf b/terraform/subscriptions/s940/prod/common/variables.tf index e70ad77c5..8210ded02 100644 --- a/terraform/subscriptions/s940/prod/common/variables.tf +++ b/terraform/subscriptions/s940/prod/common/variables.tf @@ -27,4 +27,9 @@ variable "storageaccounts" { lifecyclepolicy = true } } +} + +variable "resource_groups_common_temporary" { + type = string + default = "common" } \ No newline at end of file diff --git a/terraform/subscriptions/s940/prod/virtualnetwork/.terraform.lock.hcl b/terraform/subscriptions/s940/prod/virtualnetwork/.terraform.lock.hcl deleted file mode 100644 index 2b117c009..000000000 --- a/terraform/subscriptions/s940/prod/virtualnetwork/.terraform.lock.hcl +++ /dev/null @@ -1,45 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/hashicorp/azurerm" { - version = "4.3.0" - constraints = ">= 3.110.0" - hashes = [ - "h1:fTnVSvgj8qXRZ9huFnRglu5sQexshjsVdk7b5eaOckc=", - "zh:117f843126f7a045ef4401103243ef53245a5c60b3fcf1f5f22bcb3a472c71fd", - "zh:4ae400db15d43a181527a585e51a237569631d49d685f9946212d1d9830f97ec", - "zh:53d9e7c9f42918e9cefe6469898c08975504a565e684a049365c43037ac9e3e3", - "zh:80f72cd97defcef1b23de85c5778499be44d5f034e3ecffdca161e1348602ffd", - "zh:826f716d13fd567bcd2db27cdab3c08fceb96542958512a6406ce389e82532ed", - "zh:9cd1ae99efa21bd90d8be47254c25b16f6e7ff9b3ba3ca2da5aaaa1695e9db16", - "zh:a2b78223937b5d7445e9d567f109044f94ffe178200559ed1401f4371b72b25f", - "zh:c7b5b4bfa05d90bc46cf300ec8d17a4554caef986c4c5fcf2610a492b78d65e7", - "zh:ccb3ebed6c701fd502cc41c486603e443c62086dbc1cee6f69c97fcb49e2181f", - "zh:d4d0edbdc373cbb94feffd0297289da2c1f5da36c1776f692151e98b7eadb1dd", - "zh:ee63964ad68a720e3ec399228db40e40a8321639adf3fbf47716252ee6e2f070", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - ] -} - -provider "registry.terraform.io/integrations/github" { - version = "6.3.0" - constraints = "~> 6.0" - hashes = [ - "h1:LEs8NwSWwYGHxmbJvGT1w3XeAM6pogAmskY8XavuWDs=", - "zh:04fe3b820fe8c247b98b9d6810b8bb84d3e8ac08054faf450c42489815ef4bfa", - "zh:24096b2d16208d1411a58bdb8df8cd9f0558fb9054ffeb95c4e7e90a9a34f976", - "zh:2b27332adf8d08fbdc08b5f55e87691bce02c311219e6deb39c08753bd93db6d", - "zh:335dd6c2d50fcdce2ef0cc194465fdf9df1f5fdecc805804c78df30a4eb2e11e", - "zh:383a6879565969dbdf5405b651cd870c09c615dbd3df2554e5574d39d161c98c", - "zh:4903038a6bc605f372e1569695db4a2e2862e1fc6cf4faf9e13c5f8f4fa2ed94", - "zh:4cc4dffbee8b28102d38abe855b7440d4f4226261b43fda2ec289b48c3de1537", - "zh:57c30c6fe0b64fa86906700ceb1691562b62f2b1ef0404952aeb4092acb6acb3", - "zh:7bf518396fb00e4f55c406f2ffb5583b43278682a92f0864a0c47e3a74627bbb", - "zh:93c2c5cb90f74ad3c0874b7f7d8a866f28a852f0eda736c6aef8ce65d4061f4d", - "zh:9562a82a6193a2db110fb34d1aceeedb27c0a640058dce9c31b37b17eeb5f4e7", - "zh:ac97f2d111703a219f27fcbf5e89460ea98f9168badcc0913c8b214a37f76814", - "zh:c882af4d33b761ec198cedac212ab1c114d97540119dc97daca38021ab3edd0a", - "zh:c9ffd0a37f07a93af02a1caa90bfbea27a952d3e5badf4aab866ec71cdb184a3", - "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25", - ] -} diff --git a/terraform/subscriptions/s940/prod/virtualnetwork/backend.tf b/terraform/subscriptions/s940/prod/virtualnetwork/backend.tf deleted file mode 100644 index 82fa431ab..000000000 --- a/terraform/subscriptions/s940/prod/virtualnetwork/backend.tf +++ /dev/null @@ -1,27 +0,0 @@ -terraform { - required_providers { - azurerm = { - source = "hashicorp/azurerm" - version = ">=3.110.0" - } - github = { - source = "integrations/github" - version = "~> 6.0" - } - } - - backend "azurerm" { - tenant_id = "3aa4a235-b6e2-48d5-9195-7fcf05b459b0" - subscription_id = "ded7ca41-37c8-4085-862f-b11d21ab341a" - resource_group_name = "s940-tfstate" - storage_account_name = "s940radixinfra" - container_name = "infrastructure" - key = "prod/virtualnetwork/terraform.tfstate" - use_azuread_auth = true # This enables RBAC instead of access keys - } -} - -provider "azurerm" { - subscription_id = "ded7ca41-37c8-4085-862f-b11d21ab341a" - features {} -} diff --git a/terraform/subscriptions/s940/prod/virtualnetwork/main.tf b/terraform/subscriptions/s940/prod/virtualnetwork/main.tf deleted file mode 100644 index 5cfa0e308..000000000 --- a/terraform/subscriptions/s940/prod/virtualnetwork/main.tf +++ /dev/null @@ -1,99 +0,0 @@ -module "config" { - source = "../../../modules/config" -} - -module "resourcegroups" { - source = "../../../modules/resourcegroups" - name = module.config.vnet_resource_group - location = module.config.location -} - -module "azurerm_virtual_network" { - source = "../../../modules/virtualnetwork" - location = module.config.location - enviroment = "prod" #TODO - vnet_resource_group = module.resourcegroups.data.name - private_dns_zones = tolist(module.config.private_dns_zones_names) - depends_on = [module.resourcegroups] -} - -module "azurerm_public_ip_prefix_ingress" { - source = "../../../modules/network_publicipprefix" - location = module.config.location - resource_group_name = var.resource_groups_common_temporary #TODO - publicipprefixname = "ippre-ingress-radix-aks-production-${module.config.location}-001" #TODO - pipprefix = "ingress-radix-aks" - pippostfix = module.config.location - enviroment = "production" - prefix_length = 29 - publicipcounter = 4 - zones = ["1", "2", "3"] -} - -module "azurerm_public_ip_prefix_egress" { - source = "../../../modules/network_publicipprefix" - location = module.config.location - resource_group_name = var.resource_groups_common_temporary #TODO - publicipprefixname = "ippre-radix-aks-production-${module.config.location}-001" #TODO - pipprefix = "radix-aks" - pippostfix = module.config.location - enviroment = "production" - prefix_length = 29 - publicipcounter = 8 -} - -################################################################################################## -### This block are reserved to new network when Cluster are migrated to platform resources group -### - -module "azurerm_virtual_network_platform" { - source = "../../../modules/virtualnetwork" - location = module.config.location - enviroment = module.config.environment - vnet_resource_group = "cluster-vnet-hub-platform" - private_dns_zones = tolist(module.config.private_dns_zones_names) - depends_on = [module.resourcegroups] -} - -module "azurerm_public_ip_prefix_ingress_platform" { - source = "../../../modules/network_publicipprefix" - location = module.config.location - resource_group_name = module.config.common_resource_group - publicipprefixname = "ippre-ingress-radix-aks-platform-${module.config.location}-001" #TODO - pipprefix = "ingress-radix-aks" - pippostfix = module.config.location - enviroment = "platform" - prefix_length = 29 - publicipcounter = 8 - zones = ["1", "2", "3"] -} - -module "azurerm_public_ip_prefix_egress_platform" { - source = "../../../modules/network_publicipprefix" - location = module.config.location - resource_group_name = module.config.common_resource_group - publicipprefixname = "ippre-radix-aks-platform-${module.config.location}-001" #TODO - pipprefix = "radix-aks" - pippostfix = module.config.location - enviroment = "platform" - prefix_length = 28 - publicipcounter = 16 -} - -################################################################################################## - - -output "vnet_hub_id" { - value = module.azurerm_virtual_network.data.vnet_hub.id -} - -output "vnet_subnet_id" { - value = module.azurerm_virtual_network.data.vnet_subnet.id -} - -output "public_ip_prefix_ids" { - value = { - egress_id = module.azurerm_public_ip_prefix_egress.data.id - ingress_id = module.azurerm_public_ip_prefix_ingress.data.id - } -} diff --git a/terraform/subscriptions/s940/prod/virtualnetwork/variables.tf b/terraform/subscriptions/s940/prod/virtualnetwork/variables.tf deleted file mode 100644 index b57d10276..000000000 --- a/terraform/subscriptions/s940/prod/virtualnetwork/variables.tf +++ /dev/null @@ -1,9 +0,0 @@ -variable "resource_groups" { - type = list(string) - default = ["cluster-vnet-hub"] -} - -variable "resource_groups_common_temporary" { - type = string - default = "common" -} \ No newline at end of file diff --git a/terraform/subscriptions/s941/dev/clusters/main.tf b/terraform/subscriptions/s941/dev/clusters/main.tf index 425782594..079f9f9c1 100644 --- a/terraform/subscriptions/s941/dev/clusters/main.tf +++ b/terraform/subscriptions/s941/dev/clusters/main.tf @@ -5,9 +5,8 @@ module "config" { } module "resourcegroups" { - for_each = toset(var.resource_groups) source = "../../../modules/resourcegroups" - name = each.value + name = module.config.cluster_resource_group location = module.config.location } @@ -151,15 +150,6 @@ module "radix_id_velero_mi" { } } -module "nsg" { - source = "../../../modules/networksecuritygroup" - for_each = local.flattened_clusters - networksecuritygroupname = "nsg-${each.key}" - location = each.value.location - resource_group_name = each.value.resource_group_name - destination_address_prefix = each.value.destination_address_prefix -} - output "radix_id_aks_mi_id" { value = module.radix_id_aks_mi.data.id } diff --git a/terraform/subscriptions/s941/dev/clusters/variables.tf b/terraform/subscriptions/s941/dev/clusters/variables.tf index bb4de809e..8b1378917 100644 --- a/terraform/subscriptions/s941/dev/clusters/variables.tf +++ b/terraform/subscriptions/s941/dev/clusters/variables.tf @@ -1,31 +1 @@ -locals { - flattened_clusters = { - for key, value in var.clusters : key => { - name = key - resource_group_name = value.resource_group_name - location = value.location - destination_address_prefix = value.destination_address_prefix - } - } -} -variable "resource_groups" { - type = list(string) - default = ["clusters-dev"] -} - -variable "clusters" { - type = map(object({ - resource_group_name = optional(string, "clusters") - location = optional(string, "northeurope") - destination_address_prefix = string - })) - default = { - # weekly-52 = { - # destination_address_prefix = "20.223.40.149" - # } - # weekly-01 = { - # destination_address_prefix = "20.223.40.148" - # } - } -} diff --git a/terraform/subscriptions/s941/dev/common/main.tf b/terraform/subscriptions/s941/dev/common/main.tf index 753a8d059..f047e9b52 100644 --- a/terraform/subscriptions/s941/dev/common/main.tf +++ b/terraform/subscriptions/s941/dev/common/main.tf @@ -2,6 +2,64 @@ module "config" { source = "../../../modules/config" } +###Migrated from 'Virtualnetwork' start + +module "vnet_resourcegroup" { + source = "../../../modules/resourcegroups" + name = module.config.vnet_resource_group + location = module.config.location +} + +module "azurerm_virtual_network" { + source = "../../../modules/virtualnetwork" + location = module.config.location + enviroment = module.config.environment + vnet_resource_group = module.vnet_resourcegroup.data.name + private_dns_zones = tolist(module.config.private_dns_zones_names) + depends_on = [module.vnet_resourcegroup] +} + +module "azurerm_public_ip_prefix_ingress" { + source = "../../../modules/network_publicipprefix" + location = module.config.location + resource_group_name = var.resource_groups_common_temporary #TODO + publicipprefixname = "ippre-ingress-radix-aks-${var.enviroment_temporary}-${module.config.location}-001" #TODO + pipprefix = "ingress-radix-aks" + pippostfix = module.config.location + enviroment = var.enviroment_temporary #TODO + prefix_length = 30 + zones = ["1", "2", "3"] +} + +module "azurerm_public_ip_prefix_egress" { + source = "../../../modules/network_publicipprefix" + location = module.config.location + resource_group_name = var.resource_groups_common_temporary #TODO + publicipprefixname = "ippre-radix-aks-${var.enviroment_temporary}-${module.config.location}-001" #TODO + pipprefix = "radix-aks" + pippostfix = module.config.location + enviroment = var.enviroment_temporary #TODO + prefix_length = 30 +} + + +output "vnet_hub_id" { + value = module.azurerm_virtual_network.data.vnet_hub.id +} + +output "vnet_subnet_id" { + value = module.azurerm_virtual_network.data.vnet_subnet.id +} + +output "public_ip_prefix_ids" { + value = { + egress_id = module.azurerm_public_ip_prefix_egress.data.id + ingress_id = module.azurerm_public_ip_prefix_ingress.data.id + } +} + +###Migrated from 'Virtualnetwork' end + module "resourcegroups" { source = "../../../modules/resourcegroups" name = module.config.common_resource_group diff --git a/terraform/subscriptions/s941/dev/common/variables.tf b/terraform/subscriptions/s941/dev/common/variables.tf index 3fc157426..33b918288 100644 --- a/terraform/subscriptions/s941/dev/common/variables.tf +++ b/terraform/subscriptions/s941/dev/common/variables.tf @@ -24,4 +24,14 @@ variable "storageaccounts" { } } +variable "enviroment_temporary" { + type = string + default = "development" +} + +variable "resource_groups_common_temporary" { + type = string + default = "common" +} + diff --git a/terraform/subscriptions/s941/dev/virtualnetwork/.terraform.lock.hcl b/terraform/subscriptions/s941/dev/virtualnetwork/.terraform.lock.hcl deleted file mode 100644 index 6b17f5d6a..000000000 --- a/terraform/subscriptions/s941/dev/virtualnetwork/.terraform.lock.hcl +++ /dev/null @@ -1,45 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/hashicorp/azurerm" { - version = "4.2.0" - constraints = ">= 3.110.0" - hashes = [ - "h1:pWbLnqrd3olgCCMj06w4PG6R096QY3Coctb2XdcPsrg=", - "zh:44d84b8a5f2bc6a71a32d85b706200d4dbb2b6a2a9babb25193a852fbbdb9e23", - "zh:57633b586c7b73b169d047a25dd2aa8931ba86bfea22f8e54228b849525708d6", - "zh:58f4e6a80cbc3ad5c92b9c6352f8b1fce6fa0b8a3231e1317bc9b3efba605355", - "zh:a2e2cc82b0d018abe8a9535dcbc173f55b36354fe9778941bdd71c975999fb52", - "zh:a7040aac14e384137f263f1d31a6183556a5acedcc19679647f0deda3c42ba1b", - "zh:c476526f7d54766b627758134a9340984888bacd41954dd11239cbe9b592fc46", - "zh:d001651de98256162c6dc351f4a22d446b6a77d65c487a59bd987d6783a93e71", - "zh:d7bffe913c2fb2a2b7abcf7d747c707a03182a2dc0dbd60a7b5da7a8c7705c3d", - "zh:e2b04f060c72050e7b53582edaaae10d1ed41d07a07babc933c04e9f600a4542", - "zh:eed6694ca700dae58f4a1aa12e02c58d2bfb0a2f09be72f43608bb1ffe709b6b", - "zh:f29200bafe66af9700dc3eb23aa2430a68d5e3dfdd3fc41ad7ceab743c10e164", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - ] -} - -provider "registry.terraform.io/integrations/github" { - version = "6.3.0" - constraints = "~> 6.0" - hashes = [ - "h1:LEs8NwSWwYGHxmbJvGT1w3XeAM6pogAmskY8XavuWDs=", - "zh:04fe3b820fe8c247b98b9d6810b8bb84d3e8ac08054faf450c42489815ef4bfa", - "zh:24096b2d16208d1411a58bdb8df8cd9f0558fb9054ffeb95c4e7e90a9a34f976", - "zh:2b27332adf8d08fbdc08b5f55e87691bce02c311219e6deb39c08753bd93db6d", - "zh:335dd6c2d50fcdce2ef0cc194465fdf9df1f5fdecc805804c78df30a4eb2e11e", - "zh:383a6879565969dbdf5405b651cd870c09c615dbd3df2554e5574d39d161c98c", - "zh:4903038a6bc605f372e1569695db4a2e2862e1fc6cf4faf9e13c5f8f4fa2ed94", - "zh:4cc4dffbee8b28102d38abe855b7440d4f4226261b43fda2ec289b48c3de1537", - "zh:57c30c6fe0b64fa86906700ceb1691562b62f2b1ef0404952aeb4092acb6acb3", - "zh:7bf518396fb00e4f55c406f2ffb5583b43278682a92f0864a0c47e3a74627bbb", - "zh:93c2c5cb90f74ad3c0874b7f7d8a866f28a852f0eda736c6aef8ce65d4061f4d", - "zh:9562a82a6193a2db110fb34d1aceeedb27c0a640058dce9c31b37b17eeb5f4e7", - "zh:ac97f2d111703a219f27fcbf5e89460ea98f9168badcc0913c8b214a37f76814", - "zh:c882af4d33b761ec198cedac212ab1c114d97540119dc97daca38021ab3edd0a", - "zh:c9ffd0a37f07a93af02a1caa90bfbea27a952d3e5badf4aab866ec71cdb184a3", - "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25", - ] -} diff --git a/terraform/subscriptions/s941/dev/virtualnetwork/backend.tf b/terraform/subscriptions/s941/dev/virtualnetwork/backend.tf deleted file mode 100644 index d42c8ebb2..000000000 --- a/terraform/subscriptions/s941/dev/virtualnetwork/backend.tf +++ /dev/null @@ -1,28 +0,0 @@ -terraform { - required_providers { - azurerm = { - source = "hashicorp/azurerm" - version = ">=3.110.0" - } - github = { - source = "integrations/github" - version = "~> 6.0" - } - } - - backend "azurerm" { - tenant_id = "3aa4a235-b6e2-48d5-9195-7fcf05b459b0" - subscription_id = "16ede44b-1f74-40a5-b428-46cca9a5741b" - resource_group_name = "s941-tfstate" - storage_account_name = "s941radixinfra" - container_name = "infrastructure" - key = "dev/virtualnetwork/terraform.tfstate" - use_azuread_auth = true # This enables RBAC instead of access keys - } -} - -provider "azurerm" { - subscription_id = "16ede44b-1f74-40a5-b428-46cca9a5741b" - features { - } -} diff --git a/terraform/subscriptions/s941/dev/virtualnetwork/input.tf b/terraform/subscriptions/s941/dev/virtualnetwork/input.tf deleted file mode 100644 index aee407784..000000000 --- a/terraform/subscriptions/s941/dev/virtualnetwork/input.tf +++ /dev/null @@ -1,10 +0,0 @@ -locals { - - ## Backend Config - backend = { - resource_group_name = "s941-tfstate" - storage_account_name = "s941radixinfra" - container_name = "infrastructure" - subscription_id = "16ede44b-1f74-40a5-b428-46cca9a5741b" - } -} diff --git a/terraform/subscriptions/s941/dev/virtualnetwork/main.tf b/terraform/subscriptions/s941/dev/virtualnetwork/main.tf deleted file mode 100644 index de5268ad5..000000000 --- a/terraform/subscriptions/s941/dev/virtualnetwork/main.tf +++ /dev/null @@ -1,57 +0,0 @@ -module "config" { - source = "../../../modules/config" -} - -module "resourcegroups" { - source = "../../../modules/resourcegroups" - name = module.config.vnet_resource_group - location = module.config.location -} - -module "azurerm_virtual_network" { - source = "../../../modules/virtualnetwork" - location = module.config.location - enviroment = module.config.environment - vnet_resource_group = module.resourcegroups.data.name - private_dns_zones = tolist(module.config.private_dns_zones_names) - depends_on = [module.resourcegroups] -} - -module "azurerm_public_ip_prefix_ingress" { - source = "../../../modules/network_publicipprefix" - location = module.config.location - resource_group_name = var.resource_groups_common_temporary #TODO - publicipprefixname = "ippre-ingress-radix-aks-${var.enviroment_temporary}-${module.config.location}-001" #TODO - pipprefix = "ingress-radix-aks" - pippostfix = module.config.location - enviroment = var.enviroment_temporary #TODO - prefix_length = 30 - zones = ["1", "2", "3"] -} - -module "azurerm_public_ip_prefix_egress" { - source = "../../../modules/network_publicipprefix" - location = module.config.location - resource_group_name = var.resource_groups_common_temporary #TODO - publicipprefixname = "ippre-radix-aks-${var.enviroment_temporary}-${module.config.location}-001" #TODO - pipprefix = "radix-aks" - pippostfix = module.config.location - enviroment = var.enviroment_temporary #TODO - prefix_length = 30 -} - - -output "vnet_hub_id" { - value = module.azurerm_virtual_network.data.vnet_hub.id -} - -output "vnet_subnet_id" { - value = module.azurerm_virtual_network.data.vnet_subnet.id -} - -output "public_ip_prefix_ids" { - value = { - egress_id = module.azurerm_public_ip_prefix_egress.data.id - ingress_id = module.azurerm_public_ip_prefix_ingress.data.id - } -} diff --git a/terraform/subscriptions/s941/dev/virtualnetwork/variables.tf b/terraform/subscriptions/s941/dev/virtualnetwork/variables.tf deleted file mode 100644 index a5d6b930e..000000000 --- a/terraform/subscriptions/s941/dev/virtualnetwork/variables.tf +++ /dev/null @@ -1,14 +0,0 @@ -variable "resource_groups" { - type = list(string) - default = ["cluster-vnet-hub"] -} - -variable "enviroment_temporary" { - type = string - default = "development" -} - -variable "resource_groups_common_temporary" { - type = string - default = "common" -} diff --git a/terraform/subscriptions/s941/playground/clusters/main.tf b/terraform/subscriptions/s941/playground/clusters/main.tf index e46a5f605..b420dbbb5 100644 --- a/terraform/subscriptions/s941/playground/clusters/main.tf +++ b/terraform/subscriptions/s941/playground/clusters/main.tf @@ -5,9 +5,8 @@ module "config" { } module "resourcegroups" { - for_each = toset(var.resource_groups) source = "../../../modules/resourcegroups" - name = each.value + name = module.config.cluster_resource_group location = module.config.location } @@ -150,15 +149,6 @@ module "radix_id_velero_mi" { } } -module "nsg" { - source = "../../../modules/networksecuritygroup" - for_each = local.flattened_clusters - networksecuritygroupname = "nsg-${each.key}" - location = each.value.location - resource_group_name = each.value.resource_group_name - destination_address_prefix = each.value.destination_address_prefix -} - output "radix_id_aks_mi_id" { value = module.radix_id_aks_mi.data.id } diff --git a/terraform/subscriptions/s941/playground/clusters/variables.tf b/terraform/subscriptions/s941/playground/clusters/variables.tf index 31e23d4c4..e69de29bb 100644 --- a/terraform/subscriptions/s941/playground/clusters/variables.tf +++ b/terraform/subscriptions/s941/playground/clusters/variables.tf @@ -1,31 +0,0 @@ -locals { - flattened_clusters = { - for key, value in var.clusters : key => { - name = key - resource_group_name = value.resource_group_name - location = value.location - destination_address_prefix = value.destination_address_prefix - } - } -} - -variable "resource_groups" { - type = list(string) - default = ["clusters-playground"] -} - -variable "clusters" { - type = map(object({ - resource_group_name = optional(string, "clusters") - location = optional(string, "northeurope") - destination_address_prefix = string - })) - default = { - # weekly-52 = { - # destination_address_prefix = "20.223.40.149" - # } - # weekly-01 = { - # destination_address_prefix = "20.223.40.148" - # } - } -} \ No newline at end of file diff --git a/terraform/subscriptions/s941/playground/common/.terraform.lock.hcl b/terraform/subscriptions/s941/playground/common/.terraform.lock.hcl index 542d4f661..602be16f7 100644 --- a/terraform/subscriptions/s941/playground/common/.terraform.lock.hcl +++ b/terraform/subscriptions/s941/playground/common/.terraform.lock.hcl @@ -40,3 +40,25 @@ provider "registry.terraform.io/hashicorp/azurerm" { "zh:fb9d78dfeca7489bffca9b1a1f3abee7f16dbbcba31388aea1102062c1d6dce8", ] } + +provider "registry.terraform.io/integrations/github" { + version = "6.3.1" + hashes = [ + "h1:kNCbU7jr9j09hqWwyXGFDN95Un28gWO2kY2yImv1MDY=", + "zh:25ae1cb97ec528e6b7e9330489f4a33acc0fa80b909c113a8445656bc524c5b9", + "zh:3e1f6300dc10e52a54f13352770ed79f25ff4ba9ac49b776c52a655a3488a20b", + "zh:4aaf2877ec22e63358d7c9cd48c7d7947d1a1dc4d03231f0af193d8975d5918a", + "zh:4b904a81fac12a2a7606c8d811cb9c4e13581adcaaa19e503a067ac95c515925", + "zh:54fe7e0dca04e698631a5b86bdd43ef09a31375e68f8f89970b4315cd5fc6312", + "zh:6b14f92cf62784eaf20f43ef58ce966735f30d43deeab077943bd410c0d8b8b2", + "zh:86c49a1c11c024b26b6750c446f104922a3fe8464d3706a5fb9a4a05c6ca0b0a", + "zh:8939fb6332c4a58c4e90245eb9f0110987ccafff06b45a7ed513f2759a2abe6a", + "zh:8b4068a78c1f357325d1151facdb1aff506b9cd79d2bab21a55651255a130e2f", + "zh:ae22f5e52f534f19811d7f9480b4eb442f12ff16367b3893abb4e449b029ff6b", + "zh:afae9cfd9d49002ddfea552aa4844074b9974bd56ff2c2458f2297fe0df56a5b", + "zh:bc7a434408eb16a4fbceec0bd86b108a491408b727071402ad572cdb1afa2eb7", + "zh:c8e4728ea2d2c6e3d2c1bc5e7d92ed1121c02bab687702ec2748e3a6a0844150", + "zh:f6314b2cff0c0a07a216501cda51b35e6a4c66a2418c7c9966ccfe701e01b6b0", + "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25", + ] +} diff --git a/terraform/subscriptions/s941/playground/common/main.tf b/terraform/subscriptions/s941/playground/common/main.tf index 15a142357..98ed52714 100644 --- a/terraform/subscriptions/s941/playground/common/main.tf +++ b/terraform/subscriptions/s941/playground/common/main.tf @@ -2,6 +2,64 @@ module "config" { source = "../../../modules/config" } +###Migrated from 'Virtualnetwork' start + +module "vnet_resourcegroup" { + source = "../../../modules/resourcegroups" + name = module.config.vnet_resource_group + location = module.config.location +} + +module "azurerm_virtual_network" { + source = "../../../modules/virtualnetwork" + location = module.config.location + enviroment = module.config.environment + vnet_resource_group = module.vnet_resourcegroup.data.name + private_dns_zones = tolist(module.config.private_dns_zones_names) + depends_on = [module.vnet_resourcegroup] +} + +module "azurerm_public_ip_prefix_ingress" { + source = "../../../modules/network_publicipprefix" + location = module.config.location + resource_group_name = var.resource_groups_common_temporary #TODO + publicipprefixname = "ippre-ingress-radix-aks-${module.config.environment}-${module.config.location}-001" + pipprefix = "ingress-radix-aks" + pippostfix = module.config.location + enviroment = module.config.environment + prefix_length = 30 + zones = ["1", "2", "3"] +} + +module "azurerm_public_ip_prefix_egress" { + source = "../../../modules/network_publicipprefix" + location = module.config.location + resource_group_name = var.resource_groups_common_temporary #TODO + publicipprefixname = "ippre-radix-aks-${module.config.environment}-northeurope-001" + pipprefix = "radix-aks" + pippostfix = module.config.location + enviroment = module.config.environment + prefix_length = 30 +} + + +output "vnet_hub_id" { + value = module.azurerm_virtual_network.data.vnet_hub.id +} + +output "vnet_subnet_id" { + value = module.azurerm_virtual_network.data.vnet_subnet.id +} + +output "public_ip_prefix_ids" { + value = { + egress_id = module.azurerm_public_ip_prefix_egress.data.id + ingress_id = module.azurerm_public_ip_prefix_ingress.data.id + } +} + +###Migrated from 'Virtualnetwork' end + module "resourcegroups" { source = "../../../modules/resourcegroups" name = module.config.common_resource_group diff --git a/terraform/subscriptions/s941/playground/common/variables.tf b/terraform/subscriptions/s941/playground/common/variables.tf index e9fca170c..d5e044f43 100644 --- a/terraform/subscriptions/s941/playground/common/variables.tf +++ b/terraform/subscriptions/s941/playground/common/variables.tf @@ -23,4 +23,9 @@ variable "storageaccounts" { lifecyclepolicy = true } } +} + +variable "resource_groups_common_temporary" { + type = string + default = "common" } \ No newline at end of file diff --git a/terraform/subscriptions/s941/playground/virtualnetwork/.terraform.lock.hcl b/terraform/subscriptions/s941/playground/virtualnetwork/.terraform.lock.hcl deleted file mode 100644 index 11386128e..000000000 --- a/terraform/subscriptions/s941/playground/virtualnetwork/.terraform.lock.hcl +++ /dev/null @@ -1,45 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/hashicorp/azurerm" { - version = "3.113.0" - constraints = ">= 3.110.0" - hashes = [ - "h1:eEUtt0lrLdpVaF6FiDq8BGQPgEcykmhj0aNIL7hTOGw=", - "zh:12479f5664288943400447b55e50df675c28ae82ad8d373cc2e5682f3a3411f0", - "zh:1b42a14e80e568429d3b55fed753ca3ef0df9dcdfa107890d7264599c020940f", - "zh:381be6ca617f848de3baa3985a6e1788e91a803afe04a3c5c727453528b6310d", - "zh:3e70e2e07b6db1c363de3e5d0ca47f27fc956473df03329c7d2e54d3ac29176b", - "zh:87c7633aeaa828098c6055da9e67d4acaf4b46748b6b3f0267e105e55f05de25", - "zh:8d0d98226901f874770dd5220d4701a12ae8bd586994615aa7dcba12b9736bec", - "zh:9fd913acd42a60c3a90a18ce803567ef861db8779a59aacced91f2cbd86de9d9", - "zh:b6f3f7ae0a055437fb36c139af9bb3135e7f4dad172157ae1eb0177dc74d703f", - "zh:b927027ba2bf40d34e03d742fd2b6c5299023b5ab8e6f05e50aac76a46ad1094", - "zh:ceb5187b9d2a439f4e48944f3ffeeeaf47a03dbe6f3325ea1775bf659ce0aa88", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fb9d78dfeca7489bffca9b1a1f3abee7f16dbbcba31388aea1102062c1d6dce8", - ] -} - -provider "registry.terraform.io/integrations/github" { - version = "6.3.0" - constraints = "~> 6.0" - hashes = [ - "h1:LEs8NwSWwYGHxmbJvGT1w3XeAM6pogAmskY8XavuWDs=", - "zh:04fe3b820fe8c247b98b9d6810b8bb84d3e8ac08054faf450c42489815ef4bfa", - "zh:24096b2d16208d1411a58bdb8df8cd9f0558fb9054ffeb95c4e7e90a9a34f976", - "zh:2b27332adf8d08fbdc08b5f55e87691bce02c311219e6deb39c08753bd93db6d", - "zh:335dd6c2d50fcdce2ef0cc194465fdf9df1f5fdecc805804c78df30a4eb2e11e", - "zh:383a6879565969dbdf5405b651cd870c09c615dbd3df2554e5574d39d161c98c", - "zh:4903038a6bc605f372e1569695db4a2e2862e1fc6cf4faf9e13c5f8f4fa2ed94", - "zh:4cc4dffbee8b28102d38abe855b7440d4f4226261b43fda2ec289b48c3de1537", - "zh:57c30c6fe0b64fa86906700ceb1691562b62f2b1ef0404952aeb4092acb6acb3", - "zh:7bf518396fb00e4f55c406f2ffb5583b43278682a92f0864a0c47e3a74627bbb", - "zh:93c2c5cb90f74ad3c0874b7f7d8a866f28a852f0eda736c6aef8ce65d4061f4d", - "zh:9562a82a6193a2db110fb34d1aceeedb27c0a640058dce9c31b37b17eeb5f4e7", - "zh:ac97f2d111703a219f27fcbf5e89460ea98f9168badcc0913c8b214a37f76814", - "zh:c882af4d33b761ec198cedac212ab1c114d97540119dc97daca38021ab3edd0a", - "zh:c9ffd0a37f07a93af02a1caa90bfbea27a952d3e5badf4aab866ec71cdb184a3", - "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25", - ] -} diff --git a/terraform/subscriptions/s941/playground/virtualnetwork/backend.tf b/terraform/subscriptions/s941/playground/virtualnetwork/backend.tf deleted file mode 100644 index 274eca81c..000000000 --- a/terraform/subscriptions/s941/playground/virtualnetwork/backend.tf +++ /dev/null @@ -1,28 +0,0 @@ -terraform { - required_providers { - azurerm = { - source = "hashicorp/azurerm" - version = ">=3.110.0" - } - github = { - source = "integrations/github" - version = "~> 6.0" - } - } - - backend "azurerm" { - tenant_id = "3aa4a235-b6e2-48d5-9195-7fcf05b459b0" - subscription_id = "16ede44b-1f74-40a5-b428-46cca9a5741b" - resource_group_name = "s941-tfstate" - storage_account_name = "s941radixinfra" - container_name = "infrastructure" - key = "playground/virtualnetwork/terraform.tfstate" - use_azuread_auth = true # This enables RBAC instead of access keys - } -} - -provider "azurerm" { - subscription_id = "16ede44b-1f74-40a5-b428-46cca9a5741b" - features { - } -} diff --git a/terraform/subscriptions/s941/playground/virtualnetwork/input.tf b/terraform/subscriptions/s941/playground/virtualnetwork/input.tf deleted file mode 100644 index aee407784..000000000 --- a/terraform/subscriptions/s941/playground/virtualnetwork/input.tf +++ /dev/null @@ -1,10 +0,0 @@ -locals { - - ## Backend Config - backend = { - resource_group_name = "s941-tfstate" - storage_account_name = "s941radixinfra" - container_name = "infrastructure" - subscription_id = "16ede44b-1f74-40a5-b428-46cca9a5741b" - } -} diff --git a/terraform/subscriptions/s941/playground/virtualnetwork/main.tf b/terraform/subscriptions/s941/playground/virtualnetwork/main.tf deleted file mode 100644 index 85e1bd408..000000000 --- a/terraform/subscriptions/s941/playground/virtualnetwork/main.tf +++ /dev/null @@ -1,57 +0,0 @@ -module "config" { - source = "../../../modules/config" -} - -module "resourcegroups" { - source = "../../../modules/resourcegroups" - name = module.config.vnet_resource_group - location = module.config.location -} - -module "azurerm_virtual_network" { - source = "../../../modules/virtualnetwork" - location = module.config.location - enviroment = module.config.environment - vnet_resource_group = module.resourcegroups.data.name - private_dns_zones = tolist(module.config.private_dns_zones_names) - depends_on = [module.resourcegroups] -} - -module "azurerm_public_ip_prefix_ingress" { - source = "../../../modules/network_publicipprefix" - location = module.config.location - resource_group_name = var.resource_groups_common_temporary #TODO - publicipprefixname = "ippre-ingress-radix-aks-${module.config.environment}-${module.config.location}-001" - pipprefix = "ingress-radix-aks" - pippostfix = module.config.location - enviroment = module.config.environment - prefix_length = 30 - zones = ["1", "2", "3"] -} - -module "azurerm_public_ip_prefix_egress" { - source = "../../../modules/network_publicipprefix" - location = module.config.location - resource_group_name = var.resource_groups_common_temporary #TODO - publicipprefixname = "ippre-radix-aks-${module.config.environment}-northeurope-001" - pipprefix = "radix-aks" - pippostfix = module.config.location - enviroment = module.config.environment - prefix_length = 30 -} - - -output "vnet_hub_id" { - value = module.azurerm_virtual_network.data.vnet_hub.id -} - -output "vnet_subnet_id" { - value = module.azurerm_virtual_network.data.vnet_subnet.id -} - -output "public_ip_prefix_ids" { - value = { - egress_id = module.azurerm_public_ip_prefix_egress.data.id - ingress_id = module.azurerm_public_ip_prefix_ingress.data.id - } -} diff --git a/terraform/subscriptions/s941/playground/virtualnetwork/variables.tf b/terraform/subscriptions/s941/playground/virtualnetwork/variables.tf deleted file mode 100644 index 53561e440..000000000 --- a/terraform/subscriptions/s941/playground/virtualnetwork/variables.tf +++ /dev/null @@ -1,9 +0,0 @@ -variable "resource_groups" { - type = list(string) - default = ["cluster-vnet-hub"] -} - -variable "resource_groups_common_temporary" { - type = string - default = "common" -}