Skip to content

Merge main -> develop #4448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mr0re1 merged 3 commits into from
Jul 24, 2025
Merged

Merge main -> develop #4448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7242d71
Update Slurm image version to 6-10
abbas1902 Jul 23, 2025
2ceeabf
Version update `1.59.0 -> 1.59.1`
mr0re1 Jul 24, 2025
4ff7349
Merge pull request #4442 from mr0re1/hot_fix_ubuntu
mr0re1 Jul 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
)
Expand Down
2 changes: 1 addition & 1 deletion community/examples/AMD/hpc-amd-slurm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion community/examples/hpc-slurm-ubuntu2004.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion community/examples/hpc-slurm6-apptainer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions community/front-end/ofe/website/ghpcfe/templates/blueprint/cluster_config.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}"
Expand Down
2 changes: 1 addition & 1 deletion community/front-end/ofe/website/ghpcfe/templates/blueprint/partition_config.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
2 changes: 1 addition & 1 deletion community/modules/compute/htcondor-execute-point/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion community/modules/compute/mig/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion community/modules/compute/schedmd-slurm-gcp-v6-nodeset-dynamic/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
10 changes: 6 additions & 4 deletions community/modules/compute/schedmd-slurm-gcp-v6-nodeset-dynamic/source_image_logic.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}

Expand Down
2 changes: 1 addition & 1 deletion community/modules/compute/schedmd-slurm-gcp-v6-nodeset-dynamic/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ variable "instance_image" {
EOD
type = map(string)
default = {
family = "slurm-gcp-6-9-hpc-rocky-linux-8"
family = "slurm-gcp-6-10-hpc-rocky-linux-8"
project = "schedmd-slurm-public"
}

Expand Down
2 changes: 1 addition & 1 deletion community/modules/compute/schedmd-slurm-gcp-v6-nodeset-dynamic/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-dynamic/v1.59.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-dynamic/v1.59.1"
}
}
2 changes: 1 addition & 1 deletion community/modules/compute/schedmd-slurm-gcp-v6-nodeset-tpu/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.59.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-tpu/v1.59.1"
}
}
2 changes: 1 addition & 1 deletion community/modules/compute/schedmd-slurm-gcp-v6-nodeset/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ modules. For support with the underlying modules, see the instructions in the
| <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_future_reservation"></a> [future\_reservation](#input\_future\_reservation) | If set, will make use of the future reservation for the nodeset. Input can be either the future reservation name or its selfLink in the format 'projects/PROJECT\_ID/zones/ZONE/futureReservations/FUTURE\_RESERVATION\_NAME'.<br/>See https://cloud.google.com/compute/docs/instances/future-reservations-overview | `string` | `""` | 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_instance_properties"></a> [instance\_properties](#input\_instance\_properties) | Override the instance properties. Used to test features not supported by Slurm GCP,<br/>recommended for advanced usage only.<br/>See https://cloud.google.com/compute/docs/reference/rest/v1/regionInstances/bulkInsert<br/>If any sub-field (e.g. scheduling) is set, it will override the values computed by<br/>SlurmGCP and ignoring values of provided vars. | `any` | `null` | no |
| <a name="input_instance_template"></a> [instance\_template](#input\_instance\_template) | DEPRECATED: Instance template can not be specified for compute nodes. | `string` | `null` | no |
Expand Down
10 changes: 6 additions & 4 deletions community/modules/compute/schedmd-slurm-gcp-v6-nodeset/source_image_logic.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}

Expand Down
2 changes: 1 addition & 1 deletion community/modules/compute/schedmd-slurm-gcp-v6-nodeset/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ variable "instance_image" {
EOD
type = map(string)
default = {
family = "slurm-gcp-6-9-hpc-rocky-linux-8"
family = "slurm-gcp-6-10-hpc-rocky-linux-8"
project = "schedmd-slurm-public"
}

Expand Down
2 changes: 1 addition & 1 deletion community/modules/compute/schedmd-slurm-gcp-v6-nodeset/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset/v1.59.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset/v1.59.1"
}
}
2 changes: 1 addition & 1 deletion community/modules/compute/schedmd-slurm-gcp-v6-partition/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ terraform {
required_version = ">= 1.3"

provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-partition/v1.59.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-partition/v1.59.1"
}
}
4 changes: 2 additions & 2 deletions community/modules/database/slurm-cloudsql-federation/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.59.0"
module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.59.1"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.59.0"
module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.59.1"
}

required_version = ">= 0.13.0"
Expand Down
4 changes: 2 additions & 2 deletions community/modules/file-system/cloud-storage-bucket/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:cloud-storage-bucket/v1.59.0"
module_name = "blueprints/terraform/hpc-toolkit:cloud-storage-bucket/v1.59.1"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:cloud-storage-bucket/v1.59.0"
module_name = "blueprints/terraform/hpc-toolkit:cloud-storage-bucket/v1.59.1"
}
required_version = ">= 0.14.0"
}
2 changes: 1 addition & 1 deletion community/modules/file-system/nfs-server/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:nfs-server/v1.59.0"
module_name = "blueprints/terraform/hpc-toolkit:nfs-server/v1.59.1"
}

required_version = ">= 0.14.0"
Expand Down
4 changes: 2 additions & 2 deletions community/modules/files/fsi-montecarlo-on-batch/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:fsi-montecarlo-on-batch/v1.59.0"
module_name = "blueprints/terraform/hpc-toolkit:fsi-montecarlo-on-batch/v1.59.1"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:fsi-montecarlo-on-batch/v1.59.0"
module_name = "blueprints/terraform/hpc-toolkit:fsi-montecarlo-on-batch/v1.59.1"
}
}
2 changes: 1 addition & 1 deletion community/modules/internal/slurm-gcp/instance_template/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ locals {
source_image_family = (
var.source_image_family != "" && var.source_image_family != null
? var.source_image_family
: "slurm-gcp-6-9-hpc-rocky-linux-8"
: "slurm-gcp-6-10-hpc-rocky-linux-8"
)
source_image_project = (
var.source_image_project != "" && var.source_image_project != null
Expand Down
2 changes: 1 addition & 1 deletion community/modules/internal/slurm-gcp/login/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-controller/v1.59.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-controller/v1.59.1"
}
}
4 changes: 2 additions & 2 deletions community/modules/network/private-service-access/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:private-service-access/v1.59.0"
module_name = "blueprints/terraform/hpc-toolkit:private-service-access/v1.59.1"
}

provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:private-service-access/v1.59.0"
module_name = "blueprints/terraform/hpc-toolkit:private-service-access/v1.59.1"
}

required_version = ">= 1.2"
Expand Down
2 changes: 1 addition & 1 deletion community/modules/project/service-enablement/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:service-enablement/v1.59.0"
module_name = "blueprints/terraform/hpc-toolkit:service-enablement/v1.59.1"
}

required_version = ">= 0.14.0"
Expand Down
4 changes: 2 additions & 2 deletions community/modules/pubsub/bigquery-sub/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.59.0"
module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.59.1"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.59.0"
module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.59.1"
}
required_version = ">= 1.0"
}
2 changes: 1 addition & 1 deletion community/modules/pubsub/topic/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:topic/v1.59.0"
module_name = "blueprints/terraform/hpc-toolkit:topic/v1.59.1"
}
}
2 changes: 1 addition & 1 deletion community/modules/scheduler/htcondor-access-point/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:htcondor-access-point/v1.59.0"
module_name = "blueprints/terraform/hpc-toolkit:htcondor-access-point/v1.59.1"
}

required_version = ">= 1.1"
Expand Down
2 changes: 1 addition & 1 deletion community/modules/scheduler/htcondor-central-manager/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:htcondor-central-manager/v1.59.0"
module_name = "blueprints/terraform/hpc-toolkit:htcondor-central-manager/v1.59.1"
}

required_version = ">= 1.1.0"
Expand Down
2 changes: 1 addition & 1 deletion community/modules/scheduler/htcondor-pool-secrets/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:htcondor-pool-secrets/v1.59.0"
module_name = "blueprints/terraform/hpc-toolkit:htcondor-pool-secrets/v1.59.1"
}

required_version = ">= 1.3.0"
Expand Down
2 changes: 1 addition & 1 deletion community/modules/scheduler/schedmd-slurm-gcp-v6-controller/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ limitations under the License.
| <a name="input_extra_logging_flags"></a> [extra\_logging\_flags](#input\_extra\_logging\_flags) | The only available flag is `trace_api` | `map(bool)` | `{}` | no |
| <a name="input_gcloud_path_override"></a> [gcloud\_path\_override](#input\_gcloud\_path\_override) | Directory of the gcloud executable to be used during cleanup | `string` | `""` | 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 controller VM instance.<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 controller VM instance.<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_instance_template"></a> [instance\_template](#input\_instance\_template) | DEPRECATED: Instance template can not be specified for controller. | `string` | `null` | no |
| <a name="input_labels"></a> [labels](#input\_labels) | Labels, provided as a map. | `map(string)` | `{}` | no |
Expand Down
10 changes: 6 additions & 4 deletions community/modules/scheduler/schedmd-slurm-gcp-v6-controller/source_image_logic.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}

Expand Down
Loading
Loading