Move c2 acr to common-c2

equinor · Feb 21, 2025 · 75c6686 · 75c6686
1 parent 70dd2a4
commit 75c6686
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/terraform/subscriptions/modules/acr/main.tf b/terraform/subscriptions/modules/acr/main.tf
@@ -2,7 +2,7 @@
 resource "azurerm_container_registry" "this" {
   name                          = "radix${var.acr}app"
   location                      = var.location
-  resource_group_name           = var.resource_group_name == "common-c2" ? "common" : var.resource_group_name
+  resource_group_name           = var.resource_group_name
   sku                           = "Premium"
   zone_redundancy_enabled       = false
   admin_enabled                 = false
@@ -68,7 +68,7 @@ resource "azurerm_management_lock" "this" {
 resource "azurerm_container_registry" "env" {
   name                          = "radix${var.acr}" == "radixc2" ? "radixc2prod" : "radix${var.acr}"
   location                      = var.location
-  resource_group_name           = var.resource_group_name == "common-c2" ? "common-westeurope" : var.resource_group_name
+  resource_group_name           = var.resource_group_name
   sku                           = "Premium"
   zone_redundancy_enabled       = false
   admin_enabled                 = true

diff --git a/terraform/subscriptions/s940/c2/base-infrastructure/acr.tf b/terraform/subscriptions/s940/c2/base-infrastructure/acr.tf
@@ -1,10 +1,10 @@
 module "acr" {
   source               = "../../../modules/acr"
   location             = module.config.location
-  resource_group_name  = module.config.common_resource_group
+  resource_group_name  = module.resourcegroup_common.data.name
   acr                  = module.config.environment
-  vnet_resource_group  = module.config.vnet_resource_group
-  subnet_id            = module.azurerm_virtual_network.azurerm_subnet_id
+  vnet_resource_group  = module.azurerm_virtual_network.data.vnet_hub.resource_group_name
+  subnet_id            = module.azurerm_virtual_network.data.vnet_subnet.id
   dockercredentials_id = "/subscriptions/${module.config.subscription}/resourceGroups/${module.config.common_resource_group}/providers/Microsoft.ContainerRegistry/registries/radix${module.config.environment}cache/credentialSets/radix-service-account-docker"
   radix_cr_cicd        = replace(replace(module.app_application_registration.cr_cicd.azuread_service_principal_id, "/servicePrincipals/", ""), "/", "")
 }