Skip to content

Commit

Permalink
Back to having a nested block with fix, thanks @jroiseux
Browse files Browse the repository at this point in the history
  • Loading branch information
@abousias
abousias authored Jun 22, 2022
1 parent b17ccb1 commit e0b4718
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 45 deletions.
14 changes: 6 additions & 8 deletions autogen/main/cluster.tf.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,18 +89,16 @@ 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 ? [1] : []
for_each = length(var.monitoring_enabled_components) > 0 || var.enable_managed_prometheus ? [1] : []

content {
enable_components = var.monitoring_enabled_components
}
}
dynamic "monitoring_config" {
for_each = var.enable_managed_prometheus ? [1] : []
dynamic "managed_prometheus" {
for_each = var.enable_managed_prometheus ? [1] : []

content {
managed_prometheus {
enabled = var.enable_managed_prometheus
content {
enabled = var.enable_managed_prometheus
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion autogen/main/main.tf.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ locals {
] : []
cluster_cloudrun_enabled = var.cloudrun
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.enable_managed_prometheus
{% endif %}

cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{
Expand Down
14 changes: 6 additions & 8 deletions modules/beta-private-cluster-update-variant/cluster.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,18 +78,16 @@ 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 ? [1] : []
for_each = length(var.monitoring_enabled_components) > 0 || var.enable_managed_prometheus ? [1] : []

content {
enable_components = var.monitoring_enabled_components
}
}
dynamic "monitoring_config" {
for_each = var.enable_managed_prometheus ? [1] : []
dynamic "managed_prometheus" {
for_each = var.enable_managed_prometheus ? [1] : []

content {
managed_prometheus {
enabled = var.enable_managed_prometheus
content {
enabled = var.enable_managed_prometheus
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion modules/beta-private-cluster-update-variant/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ locals {
] : []
cluster_cloudrun_enabled = var.cloudrun
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.enable_managed_prometheus

cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{
security_group = var.authenticator_security_group
Expand Down
14 changes: 6 additions & 8 deletions modules/beta-private-cluster/cluster.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,18 +78,16 @@ 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 ? [1] : []
for_each = length(var.monitoring_enabled_components) > 0 || var.enable_managed_prometheus ? [1] : []

content {
enable_components = var.monitoring_enabled_components
}
}
dynamic "monitoring_config" {
for_each = var.enable_managed_prometheus ? [1] : []
dynamic "managed_prometheus" {
for_each = var.enable_managed_prometheus ? [1] : []

content {
managed_prometheus {
enabled = var.enable_managed_prometheus
content {
enabled = var.enable_managed_prometheus
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion modules/beta-private-cluster/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ locals {
] : []
cluster_cloudrun_enabled = var.cloudrun
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.enable_managed_prometheus

cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{
security_group = var.authenticator_security_group
Expand Down
14 changes: 6 additions & 8 deletions modules/beta-public-cluster-update-variant/cluster.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,18 +78,16 @@ 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 ? [1] : []
for_each = length(var.monitoring_enabled_components) > 0 || var.enable_managed_prometheus ? [1] : []

content {
enable_components = var.monitoring_enabled_components
}
}
dynamic "monitoring_config" {
for_each = var.enable_managed_prometheus ? [1] : []
dynamic "managed_prometheus" {
for_each = var.enable_managed_prometheus ? [1] : []

content {
managed_prometheus {
enabled = var.enable_managed_prometheus
content {
enabled = var.enable_managed_prometheus
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion modules/beta-public-cluster-update-variant/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ locals {
] : []
cluster_cloudrun_enabled = var.cloudrun
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.enable_managed_prometheus

cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{
security_group = var.authenticator_security_group
Expand Down
14 changes: 6 additions & 8 deletions modules/beta-public-cluster/cluster.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,18 +78,16 @@ 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 ? [1] : []
for_each = length(var.monitoring_enabled_components) > 0 || var.enable_managed_prometheus ? [1] : []

content {
enable_components = var.monitoring_enabled_components
}
}
dynamic "monitoring_config" {
for_each = var.enable_managed_prometheus ? [1] : []
dynamic "managed_prometheus" {
for_each = var.enable_managed_prometheus ? [1] : []

content {
managed_prometheus {
enabled = var.enable_managed_prometheus
content {
enabled = var.enable_managed_prometheus
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion modules/beta-public-cluster/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ locals {
] : []
cluster_cloudrun_enabled = var.cloudrun
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.enable_managed_prometheus

cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{
security_group = var.authenticator_security_group
Expand Down

0 comments on commit e0b4718

Please sign in to comment.