Skip to content
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

Jump to bottom

Hotfix 1.35.1 #2716

Merged
merged 4 commits into from
Jun 26, 2024
Merged

Hotfix 1.35.1 #2716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76b0277
Add 'source' argument for path to prolog or epilog scripts
andybubu Jun 7, 2024
eaacdac
Bump version `1.35.0 -> 1.35.1`
mr0re1 Jun 25, 2024
402993c
Remove `zones` from a3mega BP
mr0re1 Jun 26, 2024
f3f149c
Bump SlurmGCP version to `6.5.9`
mr0re1 Jun 26, 2024
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 @@ -52,7 +52,7 @@ HPC deployments on the Google Cloud Platform.`,
logging.Fatal("cmd.Help function failed: %s", err)
}
},
Version: "v1.35.0",
Version: "v1.35.1",
Annotations: annotation,
}
)
Expand Down
2 changes: 1 addition & 1 deletion community/examples/hpc-build-slurm-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ vars:
image_build_machine_type: n2d-standard-16
build_from_image_family: hpc-rocky-linux-8
build_from_image_project: cloud-hpc-image-public
build_from_git_ref: 6.5.8
build_from_git_ref: 6.5.9
built_image_family: my-custom-slurm
built_instance_image:
family: $(vars.built_image_family)
Expand Down
2 changes: 1 addition & 1 deletion community/modules/compute/gke-node-pool/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:gke-node-pool/v1.35.0"
module_name = "blueprints/terraform/hpc-toolkit:gke-node-pool/v1.35.1"
}
}
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 @@ -25,6 +25,6 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:htcondor-execute-point/v1.35.0"
module_name = "blueprints/terraform/hpc-toolkit:htcondor-execute-point/v1.35.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.35.0"
module_name = "blueprints/terraform/hpc-toolkit:mig/v1.35.1"
}
}
2 changes: 1 addition & 1 deletion community/modules/compute/schedmd-slurm-gcp-v5-node-group/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:schedmd-slurm-gcp-v5-node-group/v1.35.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-node-group/v1.35.1"
}
required_version = ">= 1.1"
}
2 changes: 1 addition & 1 deletion community/modules/compute/schedmd-slurm-gcp-v5-partition/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:schedmd-slurm-gcp-v5-partition/v1.35.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-partition/v1.35.1"
}
required_version = ">= 0.13.0"
}
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 @@ -25,6 +25,6 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-tpu/v1.35.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-tpu/v1.35.1"
}
}
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.35.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset/v1.35.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.35.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-partition/v1.35.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.35.0"
module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.35.1"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.35.0"
module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.35.1"
}

required_version = ">= 0.13.0"
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -26,7 +26,7 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:cloud-storage-bucket/v1.35.0"
module_name = "blueprints/terraform/hpc-toolkit:cloud-storage-bucket/v1.35.1"
}
required_version = ">= 0.14.0"
}
2 changes: 1 addition & 1 deletion community/modules/file-system/gke-persistent-volume/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:gke-persistent-volume/v1.35.0"
module_name = "blueprints/terraform/hpc-toolkit:gke-persistent-volume/v1.35.1"
}
}
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.35.0"
module_name = "blueprints/terraform/hpc-toolkit:nfs-server/v1.35.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.35.0"
module_name = "blueprints/terraform/hpc-toolkit:fsi-montecarlo-on-batch/v1.35.1"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:fsi-montecarlo-on-batch/v1.35.0"
module_name = "blueprints/terraform/hpc-toolkit:fsi-montecarlo-on-batch/v1.35.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.35.0"
module_name = "blueprints/terraform/hpc-toolkit:private-service-access/v1.35.1"
}

provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:private-service-access/v1.35.0"
module_name = "blueprints/terraform/hpc-toolkit:private-service-access/v1.35.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.35.0"
module_name = "blueprints/terraform/hpc-toolkit:service-enablement/v1.35.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.35.0"
module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.35.1"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.35.0"
module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.35.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.35.0"
module_name = "blueprints/terraform/hpc-toolkit:topic/v1.35.1"
}
}
2 changes: 1 addition & 1 deletion community/modules/scheduler/gke-cluster/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:gke-cluster/v1.35.0"
module_name = "blueprints/terraform/hpc-toolkit:gke-cluster/v1.35.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 @@ -26,7 +26,7 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:htcondor-access-point/v1.35.0"
module_name = "blueprints/terraform/hpc-toolkit:htcondor-access-point/v1.35.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 @@ -22,7 +22,7 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:htcondor-central-manager/v1.35.0"
module_name = "blueprints/terraform/hpc-toolkit:htcondor-central-manager/v1.35.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.35.0"
module_name = "blueprints/terraform/hpc-toolkit:htcondor-pool-secrets/v1.35.1"
}

required_version = ">= 1.3.0"
Expand Down
2 changes: 1 addition & 1 deletion community/modules/scheduler/schedmd-slurm-gcp-v5-controller/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:schedmd-slurm-gcp-v5-controller/v1.35.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-controller/v1.35.1"
}
required_version = ">= 1.1"
}
2 changes: 1 addition & 1 deletion community/modules/scheduler/schedmd-slurm-gcp-v5-login/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:schedmd-slurm-gcp-v5-login/v1.35.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-login/v1.35.1"
}
required_version = ">= 1.1"
}
20 changes: 10 additions & 10 deletions 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 @@ -195,14 +195,14 @@ limitations under the License.
| Name | Source | Version |
|------|--------|---------|
| <a name="module_bucket"></a> [bucket](#module\_bucket) | terraform-google-modules/cloud-storage/google | ~> 5.0 |
| <a name="module_slurm_controller_instance"></a> [slurm\_controller\_instance](#module\_slurm\_controller\_instance) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/_slurm_instance | 6.5.8 |
| <a name="module_slurm_controller_template"></a> [slurm\_controller\_template](#module\_slurm\_controller\_template) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template | 6.5.8 |
| <a name="module_slurm_files"></a> [slurm\_files](#module\_slurm\_files) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_files | 6.5.8 |
| <a name="module_slurm_login_instance"></a> [slurm\_login\_instance](#module\_slurm\_login\_instance) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/_slurm_instance | 6.5.8 |
| <a name="module_slurm_login_template"></a> [slurm\_login\_template](#module\_slurm\_login\_template) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template | 6.5.8 |
| <a name="module_slurm_nodeset"></a> [slurm\_nodeset](#module\_slurm\_nodeset) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_nodeset | 6.5.8 |
| <a name="module_slurm_nodeset_template"></a> [slurm\_nodeset\_template](#module\_slurm\_nodeset\_template) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template | 6.5.8 |
| <a name="module_slurm_nodeset_tpu"></a> [slurm\_nodeset\_tpu](#module\_slurm\_nodeset\_tpu) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_nodeset_tpu | 6.5.8 |
| <a name="module_slurm_controller_instance"></a> [slurm\_controller\_instance](#module\_slurm\_controller\_instance) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/_slurm_instance | 6.5.9 |
| <a name="module_slurm_controller_template"></a> [slurm\_controller\_template](#module\_slurm\_controller\_template) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template | 6.5.9 |
| <a name="module_slurm_files"></a> [slurm\_files](#module\_slurm\_files) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_files | 6.5.9 |
| <a name="module_slurm_login_instance"></a> [slurm\_login\_instance](#module\_slurm\_login\_instance) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/_slurm_instance | 6.5.9 |
| <a name="module_slurm_login_template"></a> [slurm\_login\_template](#module\_slurm\_login\_template) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template | 6.5.9 |
| <a name="module_slurm_nodeset"></a> [slurm\_nodeset](#module\_slurm\_nodeset) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_nodeset | 6.5.9 |
| <a name="module_slurm_nodeset_template"></a> [slurm\_nodeset\_template](#module\_slurm\_nodeset\_template) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template | 6.5.9 |
| <a name="module_slurm_nodeset_tpu"></a> [slurm\_nodeset\_tpu](#module\_slurm\_nodeset\_tpu) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_nodeset_tpu | 6.5.9 |

## Resources

Expand Down Expand Up @@ -255,7 +255,7 @@ limitations under the License.
| <a name="input_enable_shielded_vm"></a> [enable\_shielded\_vm](#input\_enable\_shielded\_vm) | Enable the Shielded VM configuration. Note: the instance image must support option. | `bool` | `false` | no |
| <a name="input_enable_slurm_gcp_plugins"></a> [enable\_slurm\_gcp\_plugins](#input\_enable\_slurm\_gcp\_plugins) | Enables calling hooks in scripts/slurm\_gcp\_plugins during cluster resume and suspend. | `any` | `false` | no |
| <a name="input_enable_smt"></a> [enable\_smt](#input\_enable\_smt) | Enables Simultaneous Multi-Threading (SMT) on instance. | `bool` | `false` | no |
| <a name="input_epilog_scripts"></a> [epilog\_scripts](#input\_epilog\_scripts) | List of scripts to be used for Epilog. Programs for the slurmd to execute<br>on every node when a user's job completes.<br>See https://slurm.schedmd.com/slurm.conf.html#OPT_Epilog. | <pre>list(object({<br> filename = string<br> content = string<br> }))</pre> | `[]` | no |
| <a name="input_epilog_scripts"></a> [epilog\_scripts](#input\_epilog\_scripts) | List of scripts to be used for Epilog. Programs for the slurmd to execute<br>on every node when a user's job completes.<br>See https://slurm.schedmd.com/slurm.conf.html#OPT_Epilog. | <pre>list(object({<br> filename = string<br> content = optional(string)<br> source = optional(string)<br> }))</pre> | `[]` | no |
| <a name="input_extra_logging_flags"></a> [extra\_logging\_flags](#input\_extra\_logging\_flags) | The list of extra flags for the logging system to use. See the logging\_flags variable in scripts/util.py to get the list of supported log flags. | `map(bool)` | `{}` | 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-5-hpc-rocky-linux-8",<br> "project": "schedmd-slurm-public"<br>}</pre> | no |
Expand All @@ -277,7 +277,7 @@ limitations under the License.
| <a name="input_partitions"></a> [partitions](#input\_partitions) | Cluster partitions as a list. See module slurm\_partition. | <pre>list(object({<br> partition_name = string<br> partition_conf = optional(map(string), {})<br> partition_nodeset = optional(list(string), [])<br> partition_nodeset_dyn = optional(list(string), [])<br> partition_nodeset_tpu = optional(list(string), [])<br> enable_job_exclusive = optional(bool, false)<br> }))</pre> | n/a | yes |
| <a name="input_preemptible"></a> [preemptible](#input\_preemptible) | Allow the instance to be preempted. | `bool` | `false` | no |
| <a name="input_project_id"></a> [project\_id](#input\_project\_id) | Project ID to create resources in. | `string` | n/a | yes |
| <a name="input_prolog_scripts"></a> [prolog\_scripts](#input\_prolog\_scripts) | List of scripts to be used for Prolog. Programs for the slurmd to execute<br>whenever it is asked to run a job step from a new job allocation.<br>See https://slurm.schedmd.com/slurm.conf.html#OPT_Prolog. | <pre>list(object({<br> filename = string<br> content = string<br> }))</pre> | `[]` | no |
| <a name="input_prolog_scripts"></a> [prolog\_scripts](#input\_prolog\_scripts) | List of scripts to be used for Prolog. Programs for the slurmd to execute<br>whenever it is asked to run a job step from a new job allocation.<br>See https://slurm.schedmd.com/slurm.conf.html#OPT_Prolog. | <pre>list(object({<br> filename = string<br> content = optional(string)<br> source = optional(string)<br> }))</pre> | `[]` | no |
| <a name="input_region"></a> [region](#input\_region) | The default region to place resources in. | `string` | n/a | yes |
| <a name="input_service_account"></a> [service\_account](#input\_service\_account) | DEPRECATED: Use `service_account_email` and `service_account_scopes` instead. | <pre>object({<br> email = string<br> scopes = set(string)<br> })</pre> | `null` | no |
| <a name="input_service_account_email"></a> [service\_account\_email](#input\_service\_account\_email) | Service account e-mail address to attach to the controller instance. | `string` | `null` | no |
Expand Down
4 changes: 2 additions & 2 deletions community/modules/scheduler/schedmd-slurm-gcp-v6-controller/controller.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ locals {

# INSTANCE TEMPLATE
module "slurm_controller_template" {
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template?ref=6.5.8"
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template?ref=6.5.9"

project_id = var.project_id
region = var.region
Expand Down Expand Up @@ -92,7 +92,7 @@ locals {
}

module "slurm_controller_instance" {
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/_slurm_instance?ref=6.5.8"
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/_slurm_instance?ref=6.5.9"

access_config = var.enable_controller_public_ips ? [local.access_config] : []
add_hostname_suffix = false
Expand Down
4 changes: 2 additions & 2 deletions community/modules/scheduler/schedmd-slurm-gcp-v6-controller/login.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

# TEMPLATE
module "slurm_login_template" {
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template?ref=6.5.8"
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template?ref=6.5.9"

for_each = { for x in var.login_nodes : x.name_prefix => x }

Expand Down Expand Up @@ -57,7 +57,7 @@ module "slurm_login_template" {

# INSTANCE
module "slurm_login_instance" {
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/_slurm_instance?ref=6.5.8"
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/_slurm_instance?ref=6.5.9"
for_each = { for x in var.login_nodes : x.name_prefix => x }

access_config = each.value.access_config
Expand Down
6 changes: 3 additions & 3 deletions community/modules/scheduler/schedmd-slurm-gcp-v6-controller/partition.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ locals {
# NODESET
# TODO: remove dependency on slurm-gcp repo, move to local nodeset module
module "slurm_nodeset_template" {
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template?ref=6.5.8"
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template?ref=6.5.9"
for_each = local.nodeset_map

project_id = var.project_id
Expand Down Expand Up @@ -65,7 +65,7 @@ module "slurm_nodeset_template" {
}

module "slurm_nodeset" {
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_nodeset?ref=6.5.8"
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_nodeset?ref=6.5.9"
for_each = local.nodeset_map

instance_template_self_link = module.slurm_nodeset_template[each.key].self_link
Expand All @@ -85,7 +85,7 @@ module "slurm_nodeset" {

# NODESET TPU
module "slurm_nodeset_tpu" {
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_nodeset_tpu?ref=6.5.8"
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_nodeset_tpu?ref=6.5.9"
for_each = local.nodeset_tpu_map

project_id = var.project_id
Expand Down
2 changes: 1 addition & 1 deletion community/modules/scheduler/schedmd-slurm-gcp-v6-controller/slurm_files.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ locals {
}

module "slurm_files" {
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_files?ref=6.5.8"
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_files?ref=6.5.9"

project_id = var.project_id
slurm_cluster_name = local.slurm_cluster_name
Expand Down
24 changes: 22 additions & 2 deletions community/modules/scheduler/schedmd-slurm-gcp-v6-controller/variables.tf
View file
Open in desktop
mr0re1 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -539,9 +539,19 @@ See https://slurm.schedmd.com/slurm.conf.html#OPT_Prolog.
EOD
type = list(object({
filename = string
content = string
content = optional(string)
source = optional(string)
}))
default = []

validation {
condition = alltrue([
for script in var.prolog_scripts :
(script.content != null && script.source == null) ||
(script.content == null && script.source != null)
])
error_message = "Either 'content' or 'source' must be defined, but not both."
}
}

variable "epilog_scripts" {
Expand All @@ -552,9 +562,19 @@ See https://slurm.schedmd.com/slurm.conf.html#OPT_Epilog.
EOD
type = list(object({
filename = string
content = string
content = optional(string)
source = optional(string)
}))
default = []

validation {
condition = alltrue([
for script in var.epilog_scripts :
(script.content != null && script.source == null) ||
(script.content == null && script.source != null)
])
error_message = "Either 'content' or 'source' must be defined, but not both."
}
}

variable "enable_external_prolog_epilog" {
Expand Down
Loading
Loading