Merge pull request #4448 from GoogleCloudPlatform/main

Merge `main -> develop`

Author: mr0re1

cmd/root.go

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

community/examples/AMD/hpc-amd-slurm.yaml

@@ -168,7 +168,7 @@ deployment_groups:
         # these images must match the images used by Slurm modules below because
         # we are building OpenMPI with PMI support in libraries contained in
         # Slurm installation
-        family: slurm-gcp-6-9-hpc-rocky-linux-8
+        family: slurm-gcp-6-10-hpc-rocky-linux-8
         project: schedmd-slurm-public
 
   - id: low_cost_nodeset

community/examples/hpc-slurm-ubuntu2004.yaml

@@ -24,7 +24,7 @@ vars:
   slurm_image:
     # Please refer to the following link for the latest images:
     # https://github.com/GoogleCloudPlatform/slurm-gcp/blob/master/docs/images.md#supported-operating-systems
-    family: slurm-gcp-6-9-ubuntu-2004-lts
+    family: slurm-gcp-6-10-ubuntu-2204-lts-nvidia-570
     project: schedmd-slurm-public
   instance_image_custom: true
 

community/examples/hpc-slurm6-apptainer.yaml

@@ -60,7 +60,7 @@ deployment_groups:
     settings:
       source_image_project_id: [schedmd-slurm-public]
       # see latest in https://github.com/GoogleCloudPlatform/slurm-gcp/blob/master/docs/images.md#published-image-family
-      source_image_family: slurm-gcp-6-9-hpc-rocky-linux-8
+      source_image_family: slurm-gcp-6-10-hpc-rocky-linux-8
       # You can find size of source image by using following command
       # gcloud compute images describe-from-family <source_image_family> --project schedmd-slurm-public
       disk_size: $(vars.disk_size)

community/front-end/ofe/website/ghpcfe/templates/blueprint/cluster_config.yaml.j2

@@ -64,7 +64,7 @@ deployment_groups:
     id: slurm_controller
     settings:
       instance_image:
-        family: slurm-gcp-6-9-hpc-rocky-linux-8
+        family: slurm-gcp-6-10-hpc-rocky-linux-8
         project: schedmd-slurm-public
       cloud_parameters:
         resume_rate: 0
@@ -102,7 +102,7 @@ deployment_groups:
     id: slurm_login
     settings:
       instance_image:
-        family: slurm-gcp-6-9-hpc-rocky-linux-8
+        family: slurm-gcp-6-10-hpc-rocky-linux-8
         project: schedmd-slurm-public
       num_instances: {{ cluster.num_login_nodes }}
       subnetwork_self_link: "projects/{{ cluster.project_id }}/regions/{{ cluster.cloud_region }}/subnetworks/{{ cluster.subnet.cloud_id }}"

community/front-end/ofe/website/ghpcfe/templates/blueprint/partition_config.yaml.j2

@@ -33,7 +33,7 @@
       family: {% if part.image.source_image_family == "Imported" %}{{ part.image.family }}{% else %}image-{{ part.image.family }}{% endif %}
       project: {{ cluster.project_id }}
     {% else %}
-      family: slurm-gcp-6-9-hpc-rocky-linux-8
+      family: slurm-gcp-6-10-hpc-rocky-linux-8
       project: schedmd-slurm-public
     {% endif %}
     {% if part.additional_disk_count > 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.59.0"
+    module_name = "blueprints/terraform/hpc-toolkit:htcondor-execute-point/v1.59.1"
   }
 }

community/modules/compute/mig/versions.tf

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

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

@@ -102,7 +102,7 @@ No resources.
 | <a name="input_enable_spot_vm"></a> [enable\_spot\_vm](#input\_enable\_spot\_vm) | Enable the partition to use spot VMs (https://cloud.google.com/spot-vms). | `bool` | `false` | no |
 | <a name="input_feature"></a> [feature](#input\_feature) | The node feature, used to bind nodes to the nodeset. If not set, the nodeset name will be used. | `string` | `null` | no |
 | <a name="input_guest_accelerator"></a> [guest\_accelerator](#input\_guest\_accelerator) | List of the type and count of accelerator cards attached to the instance. | <pre>list(object({<br/>    type  = string,<br/>    count = number<br/>  }))</pre> | `[]` | no |
-| <a name="input_instance_image"></a> [instance\_image](#input\_instance\_image) | Defines the image that will be used in the Slurm node group VM instances.<br/><br/>Expected Fields:<br/>name: The name of the image. Mutually exclusive with family.<br/>family: The image family to use. Mutually exclusive with name.<br/>project: The project where the image is hosted.<br/><br/>For more information on creating custom images that comply with Slurm on GCP<br/>see the "Slurm on GCP Custom Images" section in docs/vm-images.md. | `map(string)` | <pre>{<br/>  "family": "slurm-gcp-6-9-hpc-rocky-linux-8",<br/>  "project": "schedmd-slurm-public"<br/>}</pre> | no |
+| <a name="input_instance_image"></a> [instance\_image](#input\_instance\_image) | Defines the image that will be used in the Slurm node group VM instances.<br/><br/>Expected Fields:<br/>name: The name of the image. Mutually exclusive with family.<br/>family: The image family to use. Mutually exclusive with name.<br/>project: The project where the image is hosted.<br/><br/>For more information on creating custom images that comply with Slurm on GCP<br/>see the "Slurm on GCP Custom Images" section in docs/vm-images.md. | `map(string)` | <pre>{<br/>  "family": "slurm-gcp-6-10-hpc-rocky-linux-8",<br/>  "project": "schedmd-slurm-public"<br/>}</pre> | no |
 | <a name="input_instance_image_custom"></a> [instance\_image\_custom](#input\_instance\_image\_custom) | A flag that designates that the user is aware that they are requesting<br/>to use a custom and potentially incompatible image for this Slurm on<br/>GCP module.<br/><br/>If the field is set to false, only the compatible families and project<br/>names will be accepted.  The deployment will fail with any other image<br/>family or name.  If set to true, no checks will be done.<br/><br/>See: https://goo.gle/hpc-slurm-images | `bool` | `false` | no |
 | <a name="input_labels"></a> [labels](#input\_labels) | Labels to add to partition compute instances. Key-value pairs. | `map(string)` | `{}` | no |
 | <a name="input_machine_type"></a> [machine\_type](#input\_machine\_type) | Compute Platform machine type to use for this partition compute nodes. | `string` | `"c2-standard-60"` | no |

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

@@ -18,10 +18,12 @@ locals {
   # Currently supported images and projects
   known_project_families = {
     schedmd-slurm-public = [
-      "slurm-gcp-6-9-debian-11",
-      "slurm-gcp-6-9-hpc-rocky-linux-8",
-      "slurm-gcp-6-9-ubuntu-2004-lts",
-      "slurm-gcp-6-9-ubuntu-2204-lts-arm64"
+      "slurm-gcp-6-10-debian-12",
+      "slurm-gcp-6-10-hpc-rocky-linux-8",
+      "slurm-gcp-6-10-ubuntu-2204-lts-nvidia-570",
+      "slurm-gcp-6-10-ubuntu-2404-lts-nvidia-570",
+      "slurm-gcp-6-10-ubuntu-2204-lts-arm64",
+      "slurm-gcp-6-10-ubuntu-2404-lts-arm64"
     ]
   }