move modules

devops/terraform/main.tf

@@ -1,6 +1,6 @@
 module "main" {
   source                      = "git::https://github.com/MGTheTrain/gitops-ftw.git//devops/terraform?ref=main"
-  digital_product_affix       = var.digital_product_affix
+  digital_product_affix       = var.digital_product_affix_sa
   environment                 = var.environment
   resource_instance_number    = var.resource_instance_number
   location                    = var.location
@@ -9,4 +9,16 @@ module "main" {
   sa_account_tier             = var.sa_account_tier
   sa_account_replication_type = var.sa_account_replication_type
   sc_container_access_type    = var.sc_container_access_type
+}
+
+module "acr" {
+  source                         = "../../terraform/modules/acr"
+  digital_product_affix          = var.digital_product_affix_acr_module
+  environment                    = var.environment
+  resource_instance_number       = var.resource_instance_number
+  location                       = var.location
+  team                           = var.team
+  number_of_container_registries = var.number_of_container_registries
+  acr_sku                        = var.acr_sku
+  acr_admin_enabled              = var.acr_admin_enabled
 }

devops/terraform/output.tf

@@ -0,0 +1,13 @@
+# ACR
+output "container_registry_admin_username_list" {
+  value = module.acr.container_registry_admin_username_list
+}
+
+output "container_registry_admin_password_list" {
+  value     = module.acr.container_registry_admin_password_list
+  sensitive = true
+}
+
+output "container_registry_login_server_list" {
+  value = module.acr.container_registry_login_server_list
+}

devops/terraform/variables.tf

@@ -1,7 +1,13 @@
 # Azure Rg
-variable "digital_product_affix" {
+variable "digital_product_affix_sa" {
   default     = "gftfbe"
-  description = "The digital product affix."
+  description = "The digital product affix of the Storage Account module."
+  type        = string
+}
+
+variable "digital_product_affix_acr_module" {
+  default     = "mlopsftwcr"
+  description = "The digital product affix of the acr module."
   type        = string
 }
 
@@ -52,4 +58,23 @@ variable "sc_container_access_type" {
   default     = "private"
   description = "Container access type of the Storage Account Container"
   type        = string
+}
+
+# Azure Container Registry
+variable "number_of_container_registries" {
+  default     = 1
+  description = "The total number of Azure Container registries to deploy."
+  type        = number
+}
+
+variable "acr_sku" {
+  description = "SKU for the Azure Container Registry"
+  type        = string
+  default     = "Basic"
+}
+
+variable "acr_admin_enabled" {
+  description = "Flag to enable admin user for the Azure Container Registry"
+  type        = bool
+  default     = true
 }

terraform/envs/sbx-k8s-deployment/main.tf

@@ -1,6 +1,6 @@
 module "az" {
   source                        = "git::https://github.com/MGTheTrain/gitops-ftw.git//terraform/modules/az?ref=main"
-  digital_product_affix         = var.digital_product_affix_az_module
+  digital_product_affix         = var.digital_product_affix
   environment                   = var.environment
   resource_instance_number      = var.resource_instance_number
   location                      = var.location
@@ -13,16 +13,4 @@ module "az" {
   aks_max_node_count            = var.aks_max_node_count
   aks_vm_size                   = var.aks_vm_size
   aks_os_disk_size_gb           = var.aks_os_disk_size_gb
-}
-
-module "acr" {
-  source                         = "../../modules/acr"
-  digital_product_affix          = var.digital_product_affix_acr_module
-  environment                    = var.environment
-  resource_instance_number       = var.resource_instance_number
-  location                       = var.location
-  team                           = var.team
-  number_of_container_registries = var.number_of_container_registries
-  acr_sku                        = var.acr_sku
-  acr_admin_enabled              = var.acr_admin_enabled
 }

terraform/envs/sbx-k8s-deployment/output.tf

@@ -15,18 +15,4 @@ output "aks_name_list" {
 output "aks_kube_config_list" {
   value     = module.az.aks_kube_config_list
   sensitive = true
-}
-
-# ACR
-output "container_registry_admin_username_list" {
-  value = module.acr.container_registry_admin_username_list
-}
-
-output "container_registry_admin_password_list" {
-  value     = module.acr.container_registry_admin_password_list
-  sensitive = true
-}
-
-output "container_registry_login_server_list" {
-  value = module.acr.container_registry_login_server_list
 }

terraform/envs/sbx-k8s-deployment/variables.tf

@@ -1,15 +1,9 @@
-variable "digital_product_affix_az_module" {
+variable "digital_product_affix" {
   default     = "mlopsftwaz"
   description = "The digital product affix of the az module."
   type        = string
 }
 
-variable "digital_product_affix_acr_module" {
-  default     = "mlopsftwcr"
-  description = "The digital product affix of the acr module."
-  type        = string
-}
-
 variable "environment" {
   default     = "sbx"
   description = "The environment."
@@ -80,23 +74,4 @@ variable "aks_os_disk_size_gb" {
   type        = string
   default     = "128"
   description = "The AKS Agent Operating System disk size in GB"
-}
-
-# Azure Container Registry
-variable "number_of_container_registries" {
-  default     = 1
-  description = "The total number of Azure Container registries to deploy."
-  type        = number
-}
-
-variable "acr_sku" {
-  description = "SKU for the Azure Container Registry"
-  type        = string
-  default     = "Basic"
-}
-
-variable "acr_admin_enabled" {
-  description = "Flag to enable admin user for the Azure Container Registry"
-  type        = bool
-  default     = true
 }