From 383f6e47411ea590e0551e502e5977a62ebe1918 Mon Sep 17 00:00:00 2001 From: Saverio Proto Date: Thu, 23 Mar 2023 19:29:07 +0100 Subject: [PATCH] Remove unused net_profile_docker_bridge_cidr Since 2020 the default runtime is containerd and not Docker https://github.com/Azure/AKS/blob/master/CHANGELOG.md#release-2020-06-29 The setting docker_bridge_cidr is doing nothing. If you check the interfaces on the AKS nodes they dont have any Docker bridge configured. Related: https://github.com/hashicorp/terraform-provider-azurerm/issues/18119 --- README.md | 1 - examples/startup/main.tf | 1 - main.tf | 15 +++++++-------- variables.tf | 6 ------ 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 7fbf29fc..afc1486a 100644 --- a/README.md +++ b/README.md @@ -353,7 +353,6 @@ No modules. | [microsoft\_defender\_enabled](#input\_microsoft\_defender\_enabled) | (Optional) Is Microsoft Defender on the cluster enabled? Requires `var.log_analytics_workspace_enabled` to be `true` to set this variable to `true`. | `bool` | `false` | no | | [monitor\_metrics](#input\_monitor\_metrics) | (Optional) Specifies a Prometheus add-on profile for the Kubernetes Cluster
object({
annotations\_allowed = "(Optional) Specifies a comma-separated list of Kubernetes annotation keys that will be used in the resource's labels metric."
labels\_allowed = "(Optional) Specifies a Comma-separated list of additional Kubernetes label keys that will be used in the resource's labels metric."
}) | 
object({
    annotations_allowed = optional(string)
    labels_allowed      = optional(string)
  })
| `null` | no | | [net\_profile\_dns\_service\_ip](#input\_net\_profile\_dns\_service\_ip) | (Optional) IP address within the Kubernetes service address range that will be used by cluster service discovery (kube-dns). Changing this forces a new resource to be created. | `string` | `null` | no | -| [net\_profile\_docker\_bridge\_cidr](#input\_net\_profile\_docker\_bridge\_cidr) | (Optional) IP address (in CIDR notation) used as the Docker bridge IP address on nodes. Changing this forces a new resource to be created. | `string` | `null` | no | | [net\_profile\_outbound\_type](#input\_net\_profile\_outbound\_type) | (Optional) The outbound (egress) routing method which should be used for this Kubernetes Cluster. Possible values are loadBalancer and userDefinedRouting. Defaults to loadBalancer. | `string` | `"loadBalancer"` | no | | [net\_profile\_pod\_cidr](#input\_net\_profile\_pod\_cidr) | (Optional) The CIDR to use for pod IP addresses. This field can only be set when network\_plugin is set to kubenet. Changing this forces a new resource to be created. | `string` | `null` | no | | [net\_profile\_service\_cidr](#input\_net\_profile\_service\_cidr) | (Optional) The Network Range used by the Kubernetes service. Changing this forces a new resource to be created. | `string` | `null` | no | diff --git a/examples/startup/main.tf b/examples/startup/main.tf index 5c412e49..3d3f5c7e 100644 --- a/examples/startup/main.tf +++ b/examples/startup/main.tf @@ -82,7 +82,6 @@ module "aks" { ] } net_profile_dns_service_ip = "10.0.0.10" - net_profile_docker_bridge_cidr = "170.10.0.1/16" net_profile_service_cidr = "10.0.0.0/16" network_plugin = "azure" network_policy = "azure" diff --git a/main.tf b/main.tf index 9c8df48a..46c8102d 100644 --- a/main.tf +++ b/main.tf @@ -310,14 +310,13 @@ resource "azurerm_kubernetes_cluster" "main" { } } network_profile { - network_plugin = var.network_plugin - dns_service_ip = var.net_profile_dns_service_ip - docker_bridge_cidr = var.net_profile_docker_bridge_cidr - load_balancer_sku = var.load_balancer_sku - network_policy = var.network_policy - outbound_type = var.net_profile_outbound_type - pod_cidr = var.net_profile_pod_cidr - service_cidr = var.net_profile_service_cidr + network_plugin = var.network_plugin + dns_service_ip = var.net_profile_dns_service_ip + load_balancer_sku = var.load_balancer_sku + network_policy = var.network_policy + outbound_type = var.net_profile_outbound_type + pod_cidr = var.net_profile_pod_cidr + service_cidr = var.net_profile_service_cidr dynamic "load_balancer_profile" { for_each = var.load_balancer_profile_enabled && var.load_balancer_sku == "standard" ? ["load_balancer_profile"] : [] diff --git a/variables.tf b/variables.tf index 0600f5b6..df9077e5 100644 --- a/variables.tf +++ b/variables.tf @@ -644,12 +644,6 @@ variable "net_profile_dns_service_ip" { default = null } -variable "net_profile_docker_bridge_cidr" { - type = string - description = "(Optional) IP address (in CIDR notation) used as the Docker bridge IP address on nodes. Changing this forces a new resource to be created." - default = null -} - variable "net_profile_outbound_type" { type = string description = "(Optional) The outbound (egress) routing method which should be used for this Kubernetes Cluster. Possible values are loadBalancer and userDefinedRouting. Defaults to loadBalancer."