From ae26016a913077295c88551888e5f5cec970f7a9 Mon Sep 17 00:00:00 2001 From: Eric Zhao Date: Wed, 27 Sep 2023 01:31:41 +1000 Subject: [PATCH] feat!: make promethus configurable (#1715) --- autogen/main/cluster.tf.tmpl | 20 +++++++++---------- cluster.tf | 14 ++++--------- .../cluster.tf | 14 ++++--------- modules/beta-private-cluster/cluster.tf | 14 ++++--------- .../cluster.tf | 14 ++++--------- modules/beta-public-cluster/cluster.tf | 14 ++++--------- .../private-cluster-update-variant/cluster.tf | 14 ++++--------- modules/private-cluster/cluster.tf | 14 ++++--------- .../testdata/TestBetaCluster.json | 4 +--- .../testdata/TestDisableClientCert.json | 3 ++- .../TestPrivateZonalWithNetworking.json | 3 ++- .../testdata/TestSaferCluster.json | 3 ++- .../testdata/TestSandboxEnabled.json | 3 ++- .../testdata/TestSimpleAutopilotPrivate.json | 2 ++ .../testdata/TestSimpleAutopilotPublic.json | 2 ++ .../testdata/TestSimpleRegional.json | 4 +--- .../testdata/TestSimpleRegionalPrivate.json | 2 ++ .../TestSimpleRegionalWithKubeConfig.json | 2 ++ .../TestSimpleRegionalWithNetworking.json | 2 ++ .../testdata/TestSimpleWindowsNodePool.json | 2 ++ .../testdata/TestSimpleZonal.json | 3 ++- .../testdata/TestSimpleZonalPrivate.json | 3 ++- 22 files changed, 63 insertions(+), 93 deletions(-) diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl index 69da5b71c5..a9a7719e67 100644 --- a/autogen/main/cluster.tf.tmpl +++ b/autogen/main/cluster.tf.tmpl @@ -113,17 +113,15 @@ resource "google_container_cluster" "primary" { 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 - } + {% if beta_cluster %} + for_each = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? [1] : [] + {% else %} + for_each = local.logmon_config_is_set || local.logmon_config_is_set ? [1] : [] + {% endif %} + content{ + enable_components = var.monitoring_enabled_components + managed_prometheus { + enabled = var.monitoring_enable_managed_prometheus } } } diff --git a/cluster.tf b/cluster.tf index 8334f7db01..7c8b05cdaa 100644 --- a/cluster.tf +++ b/cluster.tf @@ -82,17 +82,11 @@ 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] : [] - + for_each = local.logmon_config_is_set || local.logmon_config_is_set ? [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 - } + enable_components = var.monitoring_enabled_components + managed_prometheus { + enabled = var.monitoring_enable_managed_prometheus } } } diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf index e81bea4c69..756d6e0ba9 100644 --- a/modules/beta-private-cluster-update-variant/cluster.tf +++ b/modules/beta-private-cluster-update-variant/cluster.tf @@ -94,17 +94,11 @@ 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] : [] - + for_each = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? [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 - } + enable_components = var.monitoring_enabled_components + managed_prometheus { + enabled = var.monitoring_enable_managed_prometheus } } } diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf index 2646fa3858..81c79e47ec 100644 --- a/modules/beta-private-cluster/cluster.tf +++ b/modules/beta-private-cluster/cluster.tf @@ -94,17 +94,11 @@ 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] : [] - + for_each = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? [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 - } + enable_components = var.monitoring_enabled_components + managed_prometheus { + enabled = var.monitoring_enable_managed_prometheus } } } diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf index b240b2739f..4b3bb173fb 100644 --- a/modules/beta-public-cluster-update-variant/cluster.tf +++ b/modules/beta-public-cluster-update-variant/cluster.tf @@ -94,17 +94,11 @@ 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] : [] - + for_each = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? [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 - } + enable_components = var.monitoring_enabled_components + managed_prometheus { + enabled = var.monitoring_enable_managed_prometheus } } } diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf index aa6cefa09c..007cbd1448 100644 --- a/modules/beta-public-cluster/cluster.tf +++ b/modules/beta-public-cluster/cluster.tf @@ -94,17 +94,11 @@ 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] : [] - + for_each = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? [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 - } + enable_components = var.monitoring_enabled_components + managed_prometheus { + enabled = var.monitoring_enable_managed_prometheus } } } diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf index 6db8bb3e5a..191c99ec50 100644 --- a/modules/private-cluster-update-variant/cluster.tf +++ b/modules/private-cluster-update-variant/cluster.tf @@ -82,17 +82,11 @@ 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] : [] - + for_each = local.logmon_config_is_set || local.logmon_config_is_set ? [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 - } + enable_components = var.monitoring_enabled_components + managed_prometheus { + enabled = var.monitoring_enable_managed_prometheus } } } diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf index dc50906bd6..c2fa9906dc 100644 --- a/modules/private-cluster/cluster.tf +++ b/modules/private-cluster/cluster.tf @@ -82,17 +82,11 @@ 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] : [] - + for_each = local.logmon_config_is_set || local.logmon_config_is_set ? [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 - } + enable_components = var.monitoring_enabled_components + managed_prometheus { + enabled = var.monitoring_enable_managed_prometheus } } } diff --git a/test/integration/beta_cluster/testdata/TestBetaCluster.json b/test/integration/beta_cluster/testdata/TestBetaCluster.json index 5daccb0acb..aa5c8f025c 100755 --- a/test/integration/beta_cluster/testdata/TestBetaCluster.json +++ b/test/integration/beta_cluster/testdata/TestBetaCluster.json @@ -107,9 +107,7 @@ "SYSTEM_COMPONENTS" ] }, - "managedPrometheusConfig": { - "enabled": true - } + "managedPrometheusConfig": {} }, "monitoringService": "monitoring.googleapis.com/kubernetes", "name": "CLUSTER_NAME", diff --git a/test/integration/disable_client_cert/testdata/TestDisableClientCert.json b/test/integration/disable_client_cert/testdata/TestDisableClientCert.json index 1718c9829d..d10f0d2945 100755 --- a/test/integration/disable_client_cert/testdata/TestDisableClientCert.json +++ b/test/integration/disable_client_cert/testdata/TestDisableClientCert.json @@ -90,7 +90,8 @@ "enableComponents": [ "SYSTEM_COMPONENTS" ] - } + }, + "managedPrometheusConfig": {} }, "monitoringService": "monitoring.googleapis.com/kubernetes", "name": "CLUSTER_NAME", diff --git a/test/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json b/test/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json index 5d0cd6984b..51f49e2285 100755 --- a/test/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json +++ b/test/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json @@ -90,7 +90,8 @@ "enableComponents": [ "SYSTEM_COMPONENTS" ] - } + }, + "managedPrometheusConfig": {} }, "monitoringService": "monitoring.googleapis.com/kubernetes", "name": "CLUSTER_NAME", diff --git a/test/integration/safer_cluster/testdata/TestSaferCluster.json b/test/integration/safer_cluster/testdata/TestSaferCluster.json index 0af5138e80..cb1bdb3674 100755 --- a/test/integration/safer_cluster/testdata/TestSaferCluster.json +++ b/test/integration/safer_cluster/testdata/TestSaferCluster.json @@ -98,7 +98,8 @@ "enableComponents": [ "SYSTEM_COMPONENTS" ] - } + }, + "managedPrometheusConfig": {} }, "monitoringService": "monitoring.googleapis.com/kubernetes", "name": "CLUSTER_NAME", diff --git a/test/integration/sandbox_enabled/testdata/TestSandboxEnabled.json b/test/integration/sandbox_enabled/testdata/TestSandboxEnabled.json index d3f0b35a10..c915fc944d 100755 --- a/test/integration/sandbox_enabled/testdata/TestSandboxEnabled.json +++ b/test/integration/sandbox_enabled/testdata/TestSandboxEnabled.json @@ -89,7 +89,8 @@ "enableComponents": [ "SYSTEM_COMPONENTS" ] - } + }, + "managedPrometheusConfig": {} }, "monitoringService": "monitoring.googleapis.com/kubernetes", "name": "CLUSTER_NAME", diff --git a/test/integration/simple_autopilot_private/testdata/TestSimpleAutopilotPrivate.json b/test/integration/simple_autopilot_private/testdata/TestSimpleAutopilotPrivate.json index 8163554902..997ba9b5e5 100644 --- a/test/integration/simple_autopilot_private/testdata/TestSimpleAutopilotPrivate.json +++ b/test/integration/simple_autopilot_private/testdata/TestSimpleAutopilotPrivate.json @@ -136,6 +136,8 @@ "enableComponents": [ "SYSTEM_COMPONENTS" ] + }, + "managedPrometheusConfig": { } }, "monitoringService": "monitoring.googleapis.com/kubernetes", diff --git a/test/integration/simple_autopilot_public/testdata/TestSimpleAutopilotPublic.json b/test/integration/simple_autopilot_public/testdata/TestSimpleAutopilotPublic.json index 2c14c1fc39..0e92769fe6 100644 --- a/test/integration/simple_autopilot_public/testdata/TestSimpleAutopilotPublic.json +++ b/test/integration/simple_autopilot_public/testdata/TestSimpleAutopilotPublic.json @@ -130,6 +130,8 @@ "enableComponents": [ "SYSTEM_COMPONENTS" ] + }, + "managedPrometheusConfig": { } }, "monitoringService": "monitoring.googleapis.com/kubernetes", diff --git a/test/integration/simple_regional/testdata/TestSimpleRegional.json b/test/integration/simple_regional/testdata/TestSimpleRegional.json index f90d32d500..40dd394d77 100644 --- a/test/integration/simple_regional/testdata/TestSimpleRegional.json +++ b/test/integration/simple_regional/testdata/TestSimpleRegional.json @@ -105,9 +105,7 @@ "SYSTEM_COMPONENTS" ] }, - "managedPrometheusConfig": { - "enabled": true - } + "managedPrometheusConfig": {} }, "monitoringService": "monitoring.googleapis.com/kubernetes", "name": "CLUSTER_NAME", diff --git a/test/integration/simple_regional_private/testdata/TestSimpleRegionalPrivate.json b/test/integration/simple_regional_private/testdata/TestSimpleRegionalPrivate.json index 4b35e684b3..295ae578f7 100644 --- a/test/integration/simple_regional_private/testdata/TestSimpleRegionalPrivate.json +++ b/test/integration/simple_regional_private/testdata/TestSimpleRegionalPrivate.json @@ -92,6 +92,8 @@ "enableComponents": [ "SYSTEM_COMPONENTS" ] + }, + "managedPrometheusConfig": { } }, "monitoringService": "monitoring.googleapis.com/kubernetes", diff --git a/test/integration/simple_regional_with_kubeconfig/testdata/TestSimpleRegionalWithKubeConfig.json b/test/integration/simple_regional_with_kubeconfig/testdata/TestSimpleRegionalWithKubeConfig.json index b53e771ac6..33e3de8c05 100644 --- a/test/integration/simple_regional_with_kubeconfig/testdata/TestSimpleRegionalWithKubeConfig.json +++ b/test/integration/simple_regional_with_kubeconfig/testdata/TestSimpleRegionalWithKubeConfig.json @@ -89,6 +89,8 @@ "enableComponents": [ "SYSTEM_COMPONENTS" ] + }, + "managedPrometheusConfig": { } }, "monitoringService": "monitoring.googleapis.com/kubernetes", diff --git a/test/integration/simple_regional_with_networking/testdata/TestSimpleRegionalWithNetworking.json b/test/integration/simple_regional_with_networking/testdata/TestSimpleRegionalWithNetworking.json index 17d8f60bf7..5c2b2478f4 100644 --- a/test/integration/simple_regional_with_networking/testdata/TestSimpleRegionalWithNetworking.json +++ b/test/integration/simple_regional_with_networking/testdata/TestSimpleRegionalWithNetworking.json @@ -89,6 +89,8 @@ "enableComponents": [ "SYSTEM_COMPONENTS" ] + }, + "managedPrometheusConfig": { } }, "monitoringService": "monitoring.googleapis.com/kubernetes", diff --git a/test/integration/simple_windows_node_pool/testdata/TestSimpleWindowsNodePool.json b/test/integration/simple_windows_node_pool/testdata/TestSimpleWindowsNodePool.json index e0b46fb4c1..d5569ab489 100644 --- a/test/integration/simple_windows_node_pool/testdata/TestSimpleWindowsNodePool.json +++ b/test/integration/simple_windows_node_pool/testdata/TestSimpleWindowsNodePool.json @@ -94,6 +94,8 @@ "enableComponents": [ "SYSTEM_COMPONENTS" ] + }, + "managedPrometheusConfig": { } }, "monitoringService": "monitoring.googleapis.com/kubernetes", diff --git a/test/integration/simple_zonal/testdata/TestSimpleZonal.json b/test/integration/simple_zonal/testdata/TestSimpleZonal.json index 2b3c367e7a..5d1987285b 100644 --- a/test/integration/simple_zonal/testdata/TestSimpleZonal.json +++ b/test/integration/simple_zonal/testdata/TestSimpleZonal.json @@ -84,7 +84,8 @@ "enableComponents": [ "SYSTEM_COMPONENTS" ] - } + }, + "managedPrometheusConfig": {} }, "monitoringService": "monitoring.googleapis.com/kubernetes", "name": "CLUSTER_NAME", diff --git a/test/integration/simple_zonal_private/testdata/TestSimpleZonalPrivate.json b/test/integration/simple_zonal_private/testdata/TestSimpleZonalPrivate.json index 71cbbdc504..0172ee91fd 100644 --- a/test/integration/simple_zonal_private/testdata/TestSimpleZonalPrivate.json +++ b/test/integration/simple_zonal_private/testdata/TestSimpleZonalPrivate.json @@ -89,7 +89,8 @@ "enableComponents": [ "SYSTEM_COMPONENTS" ] - } + }, + "managedPrometheusConfig": {} }, "monitoringService": "monitoring.googleapis.com/kubernetes", "name": "CLUSTER_NAME",