Merge pull request GoogleCloudPlatform#4416 from GoogleCloudPlatform/release-candidate

Release candidate: v1.59.0

Author: Shuang-cnt

cluster-toolkit-writers.json

@@ -367,5 +367,11 @@
   },
   {
     "login": "ljqg"
+  },
+  {
+    "login": "sarthakag"
+  },
+  {
+    "login": "rachit-google"
   }
 ]

cmd/root.go

@@ -53,7 +53,7 @@ HPC deployments on the Google Cloud Platform.`,
 				logging.Fatal("cmd.Help function failed: %s", err)
 			}
 		},
-		Version:     "v1.58.0",
+		Version:     "v1.59.0",
 		Annotations: annotation,
 	}
 )

community/front-end/ofe/requirements.txt

@@ -37,7 +37,7 @@ google-cloud-billing==1.16.2
 google-cloud-core==2.4.3
 google-cloud-pubsub==2.29.0
 google-cloud-compute==1.29.0
-google-cloud-storage==2.19.0
+google-cloud-storage==3.1.1
 google-cloud-secret-manager==2.22.1
 google-crc32c==1.5.0
 google-resumable-media==2.7.2
@@ -63,7 +63,7 @@ mccabe==0.7.0
 mypy-extensions==1.0.0
 nodeenv==1.9.1
 oauthlib==3.2.2
-path==16.7.1
+path==17.1.0
 pkgutil_resolve_name==1.3.10
 platformdirs==4.3.7
 pre-commit==4.2.0

community/modules/compute/htcondor-execute-point/versions.tf

@@ -29,6 +29,6 @@ terraform {
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:htcondor-execute-point/v1.58.0"
+    module_name = "blueprints/terraform/hpc-toolkit:htcondor-execute-point/v1.59.0"
   }
 }

community/modules/compute/mig/versions.tf

@@ -22,6 +22,6 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:mig/v1.58.0"
+    module_name = "blueprints/terraform/hpc-toolkit:mig/v1.59.0"
   }
 }

community/modules/compute/schedmd-slurm-gcp-v6-nodeset-dynamic/README.md

@@ -66,9 +66,7 @@ modules. For support with the underlying modules, see the instructions in the
 
 ## Providers
 
-| Name | Version |
-|------|---------|
-| <a name="provider_google"></a> [google](#provider\_google) | >= 5.11 |
+No providers.
 
 ## Modules
 
@@ -79,9 +77,7 @@ modules. For support with the underlying modules, see the instructions in the
 
 ## Resources
 
-| Name | Type |
-|------|------|
-| [google_compute_image.slurm](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/compute_image) | data source |
+No resources.
 
 ## Inputs
 

community/modules/compute/schedmd-slurm-gcp-v6-nodeset-dynamic/source_image_logic.tf

@@ -32,46 +32,49 @@ locals {
   # https://github.com/terraform-google-modules/terraform-google-vm/blob/735bd415fc5f034d46aa0de7922e8fada2327c0c/modules/instance_template/main.tf#L28
   # https://cloud.google.com/apis/design/resource_names#relative_resource_name
   source_image_project_normalized = (can(var.instance_image.family) ?
-    "projects/${data.google_compute_image.slurm.project}/global/images/family" :
-    "projects/${data.google_compute_image.slurm.project}/global/images"
+    "projects/${var.instance_image.project}/global/images/family" :
+    "projects/${var.instance_image.project}/global/images"
   )
-  source_image_family = can(var.instance_image.family) ? data.google_compute_image.slurm.family : ""
-  source_image        = can(var.instance_image.name) ? data.google_compute_image.slurm.name : ""
+  source_image_family = try(var.instance_image.family, "")
+  source_image        = try(var.instance_image.name, "")
 }
 
-data "google_compute_image" "slurm" {
-  family  = try(var.instance_image.family, null)
-  name    = try(var.instance_image.name, null)
-  project = var.instance_image.project
+check "image_validation" {
+  data "google_compute_image" "slurm" {
+    family  = try(var.instance_image.family, null)
+    name    = try(var.instance_image.name, null)
+    project = var.instance_image.project
+  }
 
-  lifecycle {
-    precondition {
-      condition     = length(regexall("^projects/.+?/global/images/family$", var.instance_image.project)) == 0
-      error_message = "The \"project\" field in var.instance_image no longer supports a long-form ending in \"family\". Specify only the project ID."
-    }
+  assert {
+    condition     = length(regexall("^projects/.+?/global/images/family$", var.instance_image.project)) == 0
+    error_message = "The \"project\" field in var.instance_image no longer supports a long-form ending in \"family\". Specify only the project ID."
+  }
 
-    postcondition {
-      condition     = var.instance_image_custom || contains(keys(local.known_project_families), self.project)
-      error_message = <<-EOD
-      Images in project ${self.project} are not published by SchedMD. Images must be created by compatible releases of the Terraform and Packer modules following the guidance at https://goo.gle/hpc-slurm-images. Set var.instance_image_custom to true to silence this error and acknowledge that you are using a compatible image.
+  assert {
+    condition     = var.instance_image_custom || contains(keys(local.known_project_families), data.google_compute_image.slurm.project)
+    error_message = <<-EOD
+      Images in project ${data.google_compute_image.slurm.project} are not published by SchedMD. Images must be created by compatible releases of the Terraform and Packer modules following the guidance at https://goo.gle/hpc-slurm-images. Set var.instance_image_custom to true to silence this error and acknowledge that you are using a compatible image.
       EOD
-    }
-    postcondition {
-      condition     = !contains(keys(local.known_project_families), self.project) || try(contains(local.known_project_families[self.project], self.family), false)
-      error_message = <<-EOD
-      Image family ${self.family} published by SchedMD in project ${self.project} is not compatible with this release of the Terraform Slurm modules. Select from known compatible releases:
-      ${join("\n", [for p in try(local.known_project_families[self.project], []) : "\t\"${p}\""])}
+  }
+
+  assert {
+    condition     = !contains(keys(local.known_project_families), data.google_compute_image.slurm.project) || try(contains(local.known_project_families[data.google_compute_image.slurm.project], data.google_compute_image.slurm.family), false)
+    error_message = <<-EOD
+      Image family ${data.google_compute_image.slurm.family} published by SchedMD in project ${data.google_compute_image.slurm.project} is not compatible with this release of the Terraform Slurm modules. Select from known compatible releases:
+      ${join("\n", [for p in try(local.known_project_families[data.google_compute_image.slurm.project], []) : "\t\"${p}\""])}
       EOD
-    }
-    postcondition {
-      condition     = var.disk_size_gb >= self.disk_size_gb
-      error_message = "'disk_size_gb: ${var.disk_size_gb}' is smaller than the image size (${self.disk_size_gb}GB), please increase the blueprint disk size"
-    }
-    postcondition {
-      # Condition needs to check the suffix of the license, as prefix contains an API version which can change.
-      # Example license value: https://www.googleapis.com/compute/v1/projects/cloud-hpc-image-public/global/licenses/hpc-vm-image-feature-disable-auto-updates
-      condition     = var.allow_automatic_updates || anytrue([for license in self.licenses : endswith(license, "/projects/cloud-hpc-image-public/global/licenses/hpc-vm-image-feature-disable-auto-updates")])
-      error_message = "Disabling automatic updates is not supported with the selected VM image.  More information: https://cloud.google.com/compute/docs/instances/create-hpc-vm#disable_automatic_updates"
-    }
+  }
+
+  assert {
+    condition     = var.disk_size_gb >= data.google_compute_image.slurm.disk_size_gb
+    error_message = "'disk_size_gb: ${var.disk_size_gb}' is smaller than the image size (${data.google_compute_image.slurm.disk_size_gb}GB), please increase the blueprint disk size"
+  }
+
+  assert {
+    # Condition needs to check the suffix of the license, as prefix contains an API version which can change.
+    # Example license value: https://www.googleapis.com/compute/v1/projects/cloud-hpc-image-public/global/licenses/hpc-vm-image-feature-disable-auto-updates
+    condition     = var.allow_automatic_updates || anytrue([for license in data.google_compute_image.slurm.licenses : endswith(license, "/projects/cloud-hpc-image-public/global/licenses/hpc-vm-image-feature-disable-auto-updates")])
+    error_message = "Disabling automatic updates is not supported with the selected VM image.  More information: https://cloud.google.com/compute/docs/instances/create-hpc-vm#disable_automatic_updates"
   }
 }

community/modules/compute/schedmd-slurm-gcp-v6-nodeset-dynamic/versions.tf

@@ -24,6 +24,6 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-dynamic/v1.58.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-dynamic/v1.59.0"
   }
 }

community/modules/compute/schedmd-slurm-gcp-v6-nodeset-tpu/versions.tf

@@ -18,6 +18,6 @@ terraform {
   required_version = ">= 1.3"
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-tpu/v1.58.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-tpu/v1.59.0"
   }
 }

community/modules/compute/schedmd-slurm-gcp-v6-nodeset/README.md

@@ -151,7 +151,6 @@ modules. For support with the underlying modules, see the instructions in the
 | Name | Type |
 |------|------|
 | [terraform_data.machine_type_zone_validation](https://registry.terraform.io/providers/hashicorp/terraform/latest/docs/resources/data) | resource |
-| [google_compute_image.slurm](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/compute_image) | data source |
 | [google_compute_machine_types.machine_types_by_zone](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/compute_machine_types) | data source |
 | [google_compute_reservation.reservation](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/compute_reservation) | data source |
 | [google_compute_zones.available](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/compute_zones) | data source |
@@ -160,6 +159,7 @@ modules. For support with the underlying modules, see the instructions in the
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
+| <a name="input_accelerator_topology"></a> [accelerator\_topology](#input\_accelerator\_topology) | Specifies the shape of the Accelerator (GPU/TPU) slice. | `string` | `null` | no |
 | <a name="input_access_config"></a> [access\_config](#input\_access\_config) | Access configurations, i.e. IPs via which the VM instance can be accessed via the Internet. | <pre>list(object({<br/>    nat_ip       = string<br/>    network_tier = string<br/>  }))</pre> | `[]` | no |
 | <a name="input_additional_disks"></a> [additional\_disks](#input\_additional\_disks) | Configurations of additional disks to be included on the partition nodes. | <pre>list(object({<br/>    disk_name                  = optional(string)<br/>    device_name                = optional(string)<br/>    disk_size_gb               = optional(number)<br/>    disk_type                  = optional(string)<br/>    disk_labels                = optional(map(string))<br/>    auto_delete                = optional(bool)<br/>    boot                       = optional(bool)<br/>    disk_resource_manager_tags = optional(map(string))<br/>  }))</pre> | `[]` | no |
 | <a name="input_additional_networks"></a> [additional\_networks](#input\_additional\_networks) | Additional network interface details for GCE, if any. | <pre>list(object({<br/>    network            = optional(string)<br/>    subnetwork         = string<br/>    subnetwork_project = optional(string)<br/>    network_ip         = optional(string, "")<br/>    nic_type           = optional(string)<br/>    stack_type         = optional(string)<br/>    queue_count        = optional(number)<br/>    access_config = optional(list(object({<br/>      nat_ip       = string<br/>      network_tier = string<br/>    })), [])<br/>    ipv6_access_config = optional(list(object({<br/>      network_tier = string<br/>    })), [])<br/>    alias_ip_range = optional(list(object({<br/>      ip_cidr_range         = string<br/>      subnetwork_range_name = string<br/>    })), [])<br/>  }))</pre> | `[]` | no |