Skip to content

Commit c13fa91

Browse files
committed
Added option to specify the name of node_resource_group
1 parent df730eb commit c13fa91

File tree

4 files changed

+13
-1
lines changed

4 files changed

+13
-1
lines changed

main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ module "aks" {
135135
aks_cluster_dns_prefix = "${var.prefix}-aks"
136136
aks_cluster_sku_tier = var.aks_cluster_sku_tier
137137
aks_cluster_location = var.location
138+
node_resource_group_name = var.node_resource_group_name != "" ? var.node_resource_group_name : "MC_${local.aks_rg.name}_${var.prefix}-aks_${var.location}"
138139
cluster_support_tier = var.cluster_support_tier
139140
fips_enabled = var.fips_enabled
140141
aks_cluster_node_auto_scaling = var.default_nodepool_min_nodes == var.default_nodepool_max_nodes ? false : true

modules/azure_aks/main.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ resource "azurerm_kubernetes_cluster" "aks" {
66
name = var.aks_cluster_name
77
location = var.aks_cluster_location
88
resource_group_name = var.aks_cluster_rg
9+
node_resource_group = var.node_resource_group_name != "" ? var.node_resource_group_name : "MC_${var.aks_cluster_rg}_${var.aks_cluster_name}_${var.aks_cluster_location}"
910
dns_prefix = var.aks_private_cluster == false || var.aks_cluster_private_dns_zone_id == "" ? var.aks_cluster_dns_prefix : null
1011
dns_prefix_private_cluster = var.aks_private_cluster && var.aks_cluster_private_dns_zone_id != "" ? var.aks_cluster_dns_prefix : null
1112

@@ -134,7 +135,7 @@ data "azurerm_public_ip" "cluster_public_ip" {
134135

135136
# effective_outbound_ips is a set of strings, that needs to be converted to a list type
136137
name = split("/", tolist(azurerm_kubernetes_cluster.aks.network_profile[0].load_balancer_profile[0].effective_outbound_ips)[0])[8]
137-
resource_group_name = "MC_${var.aks_cluster_rg}_${var.aks_cluster_name}_${var.aks_cluster_location}"
138+
resource_group_name = var.node_resource_group_name != "" ? var.node_resource_group_name : "MC_${var.aks_cluster_rg}_${var.aks_cluster_name}_${var.aks_cluster_location}"
138139

139140
depends_on = [azurerm_kubernetes_cluster.aks]
140141
}

modules/azure_aks/variables.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,3 +265,8 @@ variable "aks_cluster_private_dns_zone_id" {
265265
type = string
266266
default = ""
267267
}
268+
269+
variable "node_resource_group_name" {
270+
type = string
271+
default = ""
272+
}

variables.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -839,3 +839,8 @@ variable "message_broker_capacity" {
839839
type = number
840840
default = 1
841841
}
842+
843+
variable "node_resource_group_name" {
844+
type = string
845+
default = ""
846+
}

0 commit comments

Comments
 (0)