fix: make promethus configurable

terraform-google-modules · Aug 22, 2023 · 444d911 · 444d911
1 parent 3ccb19a
commit 444d911
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 104 deletions.
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -112,21 +112,13 @@ resource "google_container_cluster" "primary" {
   {% else %}
   monitoring_service = local.logmon_config_is_set ? null : var.monitoring_service
   {% endif %}
-  dynamic "monitoring_config" {
-    for_each = length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus ? [1] : []
-
-    content {
-      enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
-
-      dynamic "managed_prometheus" {
-        for_each = var.monitoring_enable_managed_prometheus ? [1] : []
-
-        content {
-          enabled = var.monitoring_enable_managed_prometheus
-        }
-      }
+  monitoring_config {
+    enable_components  = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
+    managed_prometheus = {
+      enabled = var.monitoring_enable_managed_prometheus
     }
   }
+
   cluster_autoscaling {
     enabled = var.cluster_autoscaling.enabled
     dynamic "auto_provisioning_defaults" {

diff --git a/cluster.tf b/cluster.tf
@@ -81,21 +81,13 @@ resource "google_container_cluster" "primary" {
     }
   }
   monitoring_service = local.logmon_config_is_set ? null : var.monitoring_service
-  dynamic "monitoring_config" {
-    for_each = length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus ? [1] : []
-
-    content {
-      enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
-
-      dynamic "managed_prometheus" {
-        for_each = var.monitoring_enable_managed_prometheus ? [1] : []
-
-        content {
-          enabled = var.monitoring_enable_managed_prometheus
-        }
-      }
+  monitoring_config {
+    enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
+    managed_prometheus = {
+      enabled = var.monitoring_enable_managed_prometheus
     }
   }
+
   cluster_autoscaling {
     enabled = var.cluster_autoscaling.enabled
     dynamic "auto_provisioning_defaults" {

diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -93,21 +93,13 @@ resource "google_container_cluster" "primary" {
     }
   }
   monitoring_service = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? null : var.monitoring_service
-  dynamic "monitoring_config" {
-    for_each = length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus ? [1] : []
-
-    content {
-      enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
-
-      dynamic "managed_prometheus" {
-        for_each = var.monitoring_enable_managed_prometheus ? [1] : []
-
-        content {
-          enabled = var.monitoring_enable_managed_prometheus
-        }
-      }
+  monitoring_config {
+    enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
+    managed_prometheus = {
+      enabled = var.monitoring_enable_managed_prometheus
     }
   }
+
   cluster_autoscaling {
     enabled = var.cluster_autoscaling.enabled
     dynamic "auto_provisioning_defaults" {

diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -93,21 +93,13 @@ resource "google_container_cluster" "primary" {
     }
   }
   monitoring_service = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? null : var.monitoring_service
-  dynamic "monitoring_config" {
-    for_each = length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus ? [1] : []
-
-    content {
-      enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
-
-      dynamic "managed_prometheus" {
-        for_each = var.monitoring_enable_managed_prometheus ? [1] : []
-
-        content {
-          enabled = var.monitoring_enable_managed_prometheus
-        }
-      }
+  monitoring_config {
+    enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
+    managed_prometheus = {
+      enabled = var.monitoring_enable_managed_prometheus
     }
   }
+
   cluster_autoscaling {
     enabled = var.cluster_autoscaling.enabled
     dynamic "auto_provisioning_defaults" {

diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -93,21 +93,13 @@ resource "google_container_cluster" "primary" {
     }
   }
   monitoring_service = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? null : var.monitoring_service
-  dynamic "monitoring_config" {
-    for_each = length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus ? [1] : []
-
-    content {
-      enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
-
-      dynamic "managed_prometheus" {
-        for_each = var.monitoring_enable_managed_prometheus ? [1] : []
-
-        content {
-          enabled = var.monitoring_enable_managed_prometheus
-        }
-      }
+  monitoring_config {
+    enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
+    managed_prometheus = {
+      enabled = var.monitoring_enable_managed_prometheus
     }
   }
+
   cluster_autoscaling {
     enabled = var.cluster_autoscaling.enabled
     dynamic "auto_provisioning_defaults" {

diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -93,21 +93,13 @@ resource "google_container_cluster" "primary" {
     }
   }
   monitoring_service = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? null : var.monitoring_service
-  dynamic "monitoring_config" {
-    for_each = length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus ? [1] : []
-
-    content {
-      enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
-
-      dynamic "managed_prometheus" {
-        for_each = var.monitoring_enable_managed_prometheus ? [1] : []
-
-        content {
-          enabled = var.monitoring_enable_managed_prometheus
-        }
-      }
+  monitoring_config {
+    enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
+    managed_prometheus = {
+      enabled = var.monitoring_enable_managed_prometheus
     }
   }
+
   cluster_autoscaling {
     enabled = var.cluster_autoscaling.enabled
     dynamic "auto_provisioning_defaults" {

diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -81,21 +81,13 @@ resource "google_container_cluster" "primary" {
     }
   }
   monitoring_service = local.logmon_config_is_set ? null : var.monitoring_service
-  dynamic "monitoring_config" {
-    for_each = length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus ? [1] : []
-
-    content {
-      enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
-
-      dynamic "managed_prometheus" {
-        for_each = var.monitoring_enable_managed_prometheus ? [1] : []
-
-        content {
-          enabled = var.monitoring_enable_managed_prometheus
-        }
-      }
+  monitoring_config {
+    enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
+    managed_prometheus = {
+      enabled = var.monitoring_enable_managed_prometheus
     }
   }
+
   cluster_autoscaling {
     enabled = var.cluster_autoscaling.enabled
     dynamic "auto_provisioning_defaults" {

diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -81,21 +81,13 @@ resource "google_container_cluster" "primary" {
     }
   }
   monitoring_service = local.logmon_config_is_set ? null : var.monitoring_service
-  dynamic "monitoring_config" {
-    for_each = length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus ? [1] : []
-
-    content {
-      enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
-
-      dynamic "managed_prometheus" {
-        for_each = var.monitoring_enable_managed_prometheus ? [1] : []
-
-        content {
-          enabled = var.monitoring_enable_managed_prometheus
-        }
-      }
+  monitoring_config {
+    enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
+    managed_prometheus = {
+      enabled = var.monitoring_enable_managed_prometheus
     }
   }
+
   cluster_autoscaling {
     enabled = var.cluster_autoscaling.enabled
     dynamic "auto_provisioning_defaults" {