diff --git a/bootstrap/platform/main.tf b/bootstrap/platform/main.tf index 0c5267a..a955f9b 100644 --- a/bootstrap/platform/main.tf +++ b/bootstrap/platform/main.tf @@ -99,6 +99,9 @@ resource "helm_release" "calico" { } calicoNetwork = { bgp = "Disabled" + nodeAddressAutodetectionV4 = { + cidrs = var.calico_node_address_autodetection_cidrs + } ipPools = [ { cidr = var.pod_network_cidr @@ -115,9 +118,10 @@ resource "null_resource" "calico_ready" { depends_on = [helm_release.calico] triggers = { - kubeconfig_path = var.kubeconfig_path - calico_version = var.calico.version - pod_network_cidr = var.pod_network_cidr + kubeconfig_path = var.kubeconfig_path + calico_version = var.calico.version + pod_network_cidr = var.pod_network_cidr + calico_node_address_autodetection_cidrs = join(",", var.calico_node_address_autodetection_cidrs) } provisioner "local-exec" { @@ -330,3 +334,4 @@ resource "helm_release" "extra_tools" { } } } + diff --git a/bootstrap/platform/variables.tf b/bootstrap/platform/variables.tf index 0a0d0e6..5d7a7bb 100644 --- a/bootstrap/platform/variables.tf +++ b/bootstrap/platform/variables.tf @@ -8,6 +8,11 @@ variable "pod_network_cidr" { default = "10.244.0.0/16" } +variable "calico_node_address_autodetection_cidrs" { + type = list(string) + default = ["192.168.100.0/24"] +} + variable "calico_operator_node_name" { type = string default = "debian" @@ -85,3 +90,4 @@ variable "extra_helm_releases" { default = {} } +