Skip to content

fix(azure): make dns resource group optional #837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mrsimonemms merged 1 commit into from
Dec 2, 2024
Merged

fix(azure): make dns resource group optional #837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azure-github/terraform/azure/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ resource "kubernetes_secret_v1" "external_dns" {
"azure.json" = jsonencode({
tenantId = data.azurerm_client_config.current.tenant_id
subscriptionId = data.azurerm_client_config.current.subscription_id
resourceGroup = local.dns_zone_rg
resourceGroup = data.azurerm_dns_zone.external_dns[count.index].resource_group_name
useManagedIdentityExtension = true
userAssignedIdentityID = azurerm_kubernetes_cluster.kubefirst.kubelet_identity[0].client_id
})
Expand Down
2 changes: 1 addition & 1 deletion azure-github/terraform/azure/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ locals {
kubefirst = "true"
ProvisionedBy = "kubefirst"
}
use_dns_zone = try(local.dns_zone != "" && local.dns_zone_rg != "", false)
use_dns_zone = try(local.dns_zone != "", false)
vm_size = "<NODE_TYPE>"
}

Expand Down
2 changes: 1 addition & 1 deletion azure-gitlab/terraform/azure/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ resource "kubernetes_secret_v1" "external_dns" {
"azure.json" = jsonencode({
tenantId = data.azurerm_client_config.current.tenant_id
subscriptionId = data.azurerm_client_config.current.subscription_id
resourceGroup = local.dns_zone_rg
resourceGroup = data.azurerm_dns_zone.external_dns[count.index].resource_group_name
useManagedIdentityExtension = true
userAssignedIdentityID = azurerm_kubernetes_cluster.kubefirst.kubelet_identity[0].client_id
})
Expand Down
2 changes: 1 addition & 1 deletion azure-gitlab/terraform/azure/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ locals {
kubefirst = "true"
ProvisionedBy = "kubefirst"
}
use_dns_zone = try(local.dns_zone != "" && local.dns_zone_rg != "", false)
use_dns_zone = try(local.dns_zone != "", false)
vm_size = "<NODE_TYPE>"
}

Expand Down