Skip to content

Commit

Permalink
Merge pull request #709 from GoogleCloudPlatform/fix-gke-log-monit
Browse files Browse the repository at this point in the history
when using managed prometheus or passing monitoring config there is e…
  • Loading branch information
juliocc committed Jun 29, 2022
2 parents aa9b01c + d224404 commit 797bfc9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion modules/gke-cluster/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ resource "google_container_cluster" "cluster" {
min_master_version = var.min_master_version
network = var.network
subnetwork = var.subnetwork
logging_service = var.logging_config == null ? var.logging_service : null
logging_service = var.monitoring_config != null ? null : var.logging_config == null ? var.logging_service : null
monitoring_service = var.monitoring_config == null ? var.monitoring_service : null
resource_labels = var.labels
default_max_pods_per_node = var.enable_autopilot ? null : var.default_max_pods_per_node
Expand Down

0 comments on commit 797bfc9

Please sign in to comment.