Merge branch 'master' into cloud-function-vpc-connector-fix

foundations/environments/locals.tf

@@ -43,6 +43,7 @@ locals {
       filter           = var.audit_filter
       iam              = true
       include_children = true
+      exclusions       = {}
     }
   }
   root_node_type = split("/", var.root_node)[0]

foundations/environments/main.tf

@@ -134,7 +134,6 @@ module "audit-dataset" {
 #   source          = "../../modules/organization"
 #   organization_id = var.root_node
 #   logging_sinks   = local.logging_sinks
-#   exclusions       = {}
 # }
 
 # module "root_folder" {
@@ -143,7 +142,6 @@ module "audit-dataset" {
 #   id            = var.root_node
 #   folder_create = false
 #   logging_sinks = local.logging_sinks
-#   exclusions       = {}
 # }
 
 

modules/gke-cluster/main.tf

@@ -59,8 +59,11 @@ resource "google_container_cluster" "cluster" {
 
   # TODO(ludomagno): compute addons map in locals and use a single dynamic block
   addons_config {
-    dns_cache_config {
-      enabled = var.addons.dns_cache_config
+    dynamic "dns_cache_config" {
+      for_each = var.enable_autopilot ? [] : [""]
+      content {
+        enabled = var.addons.dns_cache_config
+      }
     }
     http_load_balancing {
       disabled = !var.addons.http_load_balancing