CR comments

Signed-off-by: drfaust92 <[email protected]>
terraform-google-modules · Dec 16, 2024 · d0f39d8 · d0f39d8
1 parent 3ca8a00
commit d0f39d8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -388,13 +388,16 @@ resource "google_container_cluster" "primary" {
       }
     }
 
+
+    {% if autopilot_cluster != true %}
     dynamic "parallelstore_csi_driver_config" {
       for_each = local.parallelstore_csi_driver_config
 
       content {
         enabled = parallelstore_csi_driver_config.value.enabled
       }
     }
+    {% endif %}
 
     {% if beta_cluster and autopilot_cluster != true %}
     istio_config {

diff --git a/autogen/main/main.tf.tmpl b/autogen/main/main.tf.tmpl
@@ -107,12 +107,12 @@ locals {
   }]
   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 || var.monitoring_enable_managed_prometheus != null
-{% endif %}
-  gke_backup_agent_config         = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
-  gcs_fuse_csi_driver_config      = var.gcs_fuse_csi_driver ? [{ enabled = true }] : []
-  stateful_ha_config              = var.stateful_ha ? [{ enabled = true }] : []
   parallelstore_csi_driver_config = var.parallelstore_csi_driver ? [{ enabled = true }] : []
-  ray_operator_config             =  length(var.ray_operator_config) > 0 && lookup(var.ray_operator_config, "enabled", false)? [var.ray_operator_config]: []
+{% endif %}
+  gke_backup_agent_config    = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
+  gcs_fuse_csi_driver_config = var.gcs_fuse_csi_driver ? [{ enabled = true }] : []
+  stateful_ha_config         = var.stateful_ha ? [{ enabled = true }] : []
+  ray_operator_config        =  length(var.ray_operator_config) > 0 && lookup(var.ray_operator_config, "enabled", false)? [var.ray_operator_config]: []
 {% if beta_cluster and autopilot_cluster != true %}
   cluster_cloudrun_config_load_balancer_config = (var.cloudrun && var.cloudrun_load_balancer_type != "") ? {
     load_balancer_type = var.cloudrun_load_balancer_type

diff --git a/autogen/main/variables.tf.tmpl b/autogen/main/variables.tf.tmpl
@@ -838,11 +838,13 @@ variable "stateful_ha" {
   default     = false
 }
 
+{% if autopilot_cluster != true %}
 variable "parallelstore_csi_driver" {
   type        = bool
   description = "Whether the Parallelstore CSI driver Addon is enabled for this cluster."
-  default     = false
+  default     = null
 }
+{% endif %}
 
 variable "ray_operator_config" {
   type        = object({