Skip to content

Commit 5f2fbac

Browse files
committed
Clean up subnet CIDR definitions
1 parent e346c17 commit 5f2fbac

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

base-infrastructure/terraform/resources/helm-ingress-nginx.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ resource "helm_release" "ifrcgo-ingress-nginx" {
2929
value = azurerm_public_ip.ifrcgo.ip_address
3030
}
3131

32+
# IP logging (preserve client IPs for ingress logs)
3233
set {
3334
name = "controller.config.use-forwarded-headers"
3435
value = "true"
@@ -46,7 +47,7 @@ resource "helm_release" "ifrcgo-ingress-nginx" {
4647

4748
set {
4849
name = "controller.config.set-real-ip-from"
49-
value = "10.1.0.0/16"
50+
value = local.aks_subnet_cidr
5051
}
5152

5253
}

base-infrastructure/terraform/resources/variables.tf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,9 @@ variable "ifrcgo_prod_resources_db_server" {
8585
# Local variables
8686

8787
locals {
88-
location = lower(replace(var.REGION, " ", ""))
89-
prefix = var.environment == "staging" ? "ifrctgo" : "ifrcpgo"
88+
location = lower(replace(var.REGION, " ", ""))
89+
prefix = var.environment == "staging" ? "ifrctgo" : "ifrcpgo"
90+
aks_subnet_cidr = "10.1.0.0/16"
9091
# stack_id = "ifrcgo"
9192
# prefixnodashes = "${local.stack_id}${var.environment}"
9293
storage = local.prefix

base-infrastructure/terraform/resources/vnet.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ resource "azurerm_subnet" "aks" {
1010
name = "${local.prefix}-aks-subnet"
1111
virtual_network_name = azurerm_virtual_network.ifrcgo-cluster.name
1212
resource_group_name = data.azurerm_resource_group.ifrcgo.name
13-
address_prefixes = ["10.1.0.0/16"]
13+
address_prefixes = [local.aks_subnet_cidr]
1414
}
1515

1616
# subnet for postgres that's delegated

0 commit comments

Comments
 (0)