zecfoundation
/
cloud-foundation-fabric
mirror of https://github.com/ZcashFoundation/cloud-foundation-fabric.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #709 from GoogleCloudPlatform/fix-gke-log-monit 

when using managed prometheus or passing monitoring config there is e…
This commit is contained in:
Julio Castillo 2022-06-29 14:34:13 +02:00 committed by GitHub
parent aa9b01cb77 d224404424
commit 797bfc90b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gke-cluster/main.tf
View File

@ -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