fis issues with private workstation-cluster module and persistent_dir…

…ectories (GoogleCloudPlatform#2247) Co-authored-by: Ludovico Magnocavallo <[email protected]>
dibaskar-google · May 14, 2024 · bac1e72 · bac1e72
1 parent 6640169
commit bac1e72
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/modules/workstation-cluster/README.md b/modules/workstation-cluster/README.md
@@ -59,6 +59,9 @@ module "workstation-cluster" {
   }
   workstation_configs = {
     my-workstation-config = {
+      gce_instance = {
+        disable_public_ip_addresses = true
+      }
       workstations = {
         my-workstation = {
           labels = {

diff --git a/modules/workstation-cluster/main.tf b/modules/workstation-cluster/main.tf
@@ -70,8 +70,8 @@ resource "google_workstations_workstation_config" "configs" {
         pool_size                    = each.value.gce_instance.pool_size
         boot_disk_size_gb            = each.value.gce_instance.boot_disk_size_gb
         tags                         = each.value.gce_instance.tags
-        disable_public_ip_addresses  = each.value.disable_public_ip_addresses
-        enable_nested_virtualization = each.value.enable_nested_virtualization
+        disable_public_ip_addresses  = each.value.gce_instance.disable_public_ip_addresses
+        enable_nested_virtualization = each.value.gce_instance.enable_nested_virtualization
         dynamic "shielded_instance_config" {
           for_each = each.value.gce_instance.shielded_instance_config == null ? [] : [""]
           content {
@@ -81,7 +81,7 @@ resource "google_workstations_workstation_config" "configs" {
           }
         }
         dynamic "confidential_instance_config" {
-          for_each = each.value.gce_instance.enable_confidential_compute ? [] : [""]
+          for_each = each.value.gce_instance.enable_confidential_compute ? [""] : []
           content {
             enable_confidential_compute = true
           }
@@ -114,6 +114,21 @@ resource "google_workstations_workstation_config" "configs" {
       kms_key_service_account = each.value.encryption_key.kms_key_service_account
     }
   }
+  dynamic "persistent_directories" {
+    for_each = each.value.persistent_directories
+    content {
+      mount_path = persistent_directories.value.mount_path
+      dynamic "gce_pd" {
+        for_each = persistent_directories.value.gce_pd == null ? [] : [""]
+        content {
+          size_gb        = persistent_directories.value.gce_pd.size_gb
+          fs_type        = persistent_directories.value.gce_pd.fs_type
+          disk_type      = persistent_directories.value.gce_pd.disk_type
+          reclaim_policy = persistent_directories.value.gce_pd.reclaim_policy
+        }
+      }
+    }
+  }
 }
 
 resource "google_workstations_workstation" "workstations" {