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

Fix csi-driver, logging and monitoring default values when autopilot … (#883) 

* Fix csi-driver, logging and monitoring default values when autopilot is used
Co-authored-by: Ludovico Magnocavallo <ludomagno@google.com>
This commit is contained in:
Daniel Marzini 2022-10-14 17:30:54 +02:00 committed by GitHub
parent 1c24e921b3
commit 49d5e21a4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
default-versions.tf
View File

@ -23,6 +23,10 @@ terraform {
source = "hashicorp/google-beta"
version = ">= 4.36.0" # tftest
}
# used in modules
archive = {
source = "hashicorp/archive"
}
# used in fast
local = {
source = "hashicorp/local"

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

@ -79,7 +79,11 @@ resource "google_container_cluster" "cluster" {
)
}
gce_persistent_disk_csi_driver_config {
enabled = var.enable_addons.gce_persistent_disk_csi_driver
enabled = (
var.enable_features.autopilot
? true
: var.enable_addons.gce_persistent_disk_csi_driver
)
}
dynamic "gcp_filestore_csi_driver_config" {
for_each = !var.enable_features.autopilot ? [""] : []
@ -169,7 +173,7 @@ resource "google_container_cluster" "cluster" {
}
dynamic "logging_config" {
for_each = var.logging_config != null ? [""] : []
for_each = var.logging_config != null && !var.enable_features.autopilot ? [""] : []
content {
enable_components = var.logging_config
}
@ -234,7 +238,7 @@ resource "google_container_cluster" "cluster" {
}
dynamic "monitoring_config" {
for_each = var.monitoring_config != null ? [""] : []
for_each = var.monitoring_config != null && !var.enable_features.autopilot ? [""] : []
content {
enable_components = var.monitoring_config
}