Skip to content

Merge v1.93.0 into Develop #5771

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
sudheer-quad merged 6 commits into from
Jun 11, 2026
Merged

Merge v1.93.0 into Develop #5771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4d7bd7a
Increase version to 1.93.0
sudheer-quad Jun 9, 2026
e4896c3
Update Toolkit release to v1.93.0 (#5758)
sudheer-quad Jun 9, 2026
1007a7e
Fix(slurm): resolve KeyError control_host in slurmdbd config template…
SwarnaBharathiMantena Jun 11, 2026
d76654f
fix: add null check for controller_state_disk
sudheer-quad Jun 11, 2026
563782f
fix: add null check for controller_state_disk (#5766)
sudheer-quad Jun 11, 2026
4485845
Release candidate: v1.93.0 (#5759)
sudheer-quad Jun 11, 2026
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 community/modules/compute/gke-nodeset/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:gke-nodeset/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:gke-nodeset/v1.93.0"
}
}
2 changes: 1 addition & 1 deletion community/modules/compute/gke-partition/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:gke-partition/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:gke-partition/v1.93.0"
}
}
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.92.0"
module_name = "blueprints/terraform/hpc-toolkit:htcondor-execute-point/v1.93.0"
}
}
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.92.0"
module_name = "blueprints/terraform/hpc-toolkit:mig/v1.93.0"
}
}
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 @@ -17,6 +17,6 @@
terraform {
required_version = "= 1.12.2"
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-dynamic/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-dynamic/v1.93.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 @@ -18,6 +18,6 @@ terraform {
required_version = "= 1.12.2"

provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-tpu/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-tpu/v1.93.0"
}
}
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.92.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset/v1.93.0"
}
}
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.12.2"

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

required_version = "= 1.12.2"
Expand Down
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.92.0"
module_name = "blueprints/terraform/hpc-toolkit:nfs-server/v1.93.0"
}

required_version = "= 1.12.2"
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.92.0"
module_name = "blueprints/terraform/hpc-toolkit:fsi-montecarlo-on-batch/v1.93.0"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:fsi-montecarlo-on-batch/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:fsi-montecarlo-on-batch/v1.93.0"
}
}
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-login/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-login/v1.93.0"
}
}
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.92.0"
module_name = "blueprints/terraform/hpc-toolkit:service-enablement/v1.93.0"
}

required_version = "= 1.12.2"
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.92.0"
module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.93.0"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.93.0"
}
required_version = "= 1.12.2"
}
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.92.0"
module_name = "blueprints/terraform/hpc-toolkit:topic/v1.93.0"
}
}
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.92.0"
module_name = "blueprints/terraform/hpc-toolkit:htcondor-access-point/v1.93.0"
}

required_version = "= 1.12.2"
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.92.0"
module_name = "blueprints/terraform/hpc-toolkit:htcondor-central-manager/v1.93.0"
}

required_version = "= 1.12.2"
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.92.0"
module_name = "blueprints/terraform/hpc-toolkit:htcondor-pool-secrets/v1.93.0"
}

required_version = "= 1.12.2"
Expand Down
1 change: 1 addition & 0 deletions ...ity/modules/scheduler/schedmd-slurm-gcp-v6-controller/modules/slurm_files/scripts/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,7 @@ def install_slurm_conf(lkp: util.Lookup) -> None:
def install_slurmdbd_conf(lkp: util.Lookup) -> None:
"""install slurmdbd.conf"""
conf_options = {
"control_host": lkp.control_host,
"dbd_host_str": f"DbdHost={lkp.control_host}",
"slurmlog": dirs.log,
"state_save": slurmdirs.state,
Expand Down
6 changes: 3 additions & 3 deletions ...ty/modules/scheduler/schedmd-slurm-gcp-v6-controller/modules/slurm_files/scripts/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ def setup_key(lkp: util.Lookup, is_primary: bool = True) -> None:
if shared_key.exists():
log.info(f"Restoring {file_name} from {shared_key}")
shutil.copyfile(shared_key, dst)
elif lkp.cfg.controller_state_disk.device_name:
elif lkp.cfg.controller_state_disk and lkp.cfg.controller_state_disk.device_name:
# For zonal state disk (files might be directly there if mounted at slurmdirs.state)
# But if slurmdirs.state IS shared_dir, we already checked shared_key.exists()
# If controller_state_disk is used, slurmdirs.state IS the persistence.
Expand Down Expand Up @@ -371,7 +371,7 @@ def update_system_config(file, content):

def _symlink_mysql_datadir(lkp: util.Lookup) -> None:
""" Symlink /var/lib/mysql to controller state disk if needed. """
if not lkp.cfg.controller_state_disk.device_name:
if not lkp.cfg.controller_state_disk or not lkp.cfg.controller_state_disk.device_name:
return

datadir = Path("/var/lib/mysql")
Expand Down Expand Up @@ -481,7 +481,7 @@ def setup_controller(is_primary: bool):

# Primary-specific state disk mounting
if is_primary:
if lkp.cfg.controller_state_disk.device_name != None:
if lkp.cfg.controller_state_disk and lkp.cfg.controller_state_disk.device_name:
mount_save_state_disk()

setup_jwt_key()
Expand Down
2 changes: 1 addition & 1 deletion community/modules/scheduler/schedmd-slurm-gcp-v6-controller/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-controller/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-controller/v1.93.0"
}
}
2 changes: 1 addition & 1 deletion community/modules/scheduler/schedmd-slurm-gcp-v6-login/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.12.2"

provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-login/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-login/v1.93.0"
}
}
2 changes: 1 addition & 1 deletion community/modules/scripts/wait-for-startup/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:wait-for-startup/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:wait-for-startup/v1.93.0"
}

required_version = "= 1.12.2"
Expand Down
2 changes: 1 addition & 1 deletion community/modules/scripts/windows-startup-script/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

terraform {
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:windows-startup-script/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:windows-startup-script/v1.93.0"
}

required_version = "= 1.12.2"
Expand Down
4 changes: 2 additions & 2 deletions modules/compute/gke-node-pool/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:gke-node-pool/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:gke-node-pool/v1.93.0"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:gke-node-pool/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:gke-node-pool/v1.93.0"
}
}
2 changes: 1 addition & 1 deletion modules/compute/resource-policy/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:resource-policy/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:resource-policy/v1.93.0"
}

required_version = "= 1.12.2"
Expand Down
4 changes: 2 additions & 2 deletions modules/compute/vm-instance/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:vm-instance/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:vm-instance/v1.93.0"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:vm-instance/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:vm-instance/v1.93.0"
}

required_version = "= 1.12.2"
Expand Down
4 changes: 2 additions & 2 deletions 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.92.0"
module_name = "blueprints/terraform/hpc-toolkit:cloud-storage-bucket/v1.93.0"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:cloud-storage-bucket/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:cloud-storage-bucket/v1.93.0"
}
required_version = "= 1.12.2"
}
4 changes: 2 additions & 2 deletions modules/file-system/filestore/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:filestore/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:filestore/v1.93.0"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:filestore/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:filestore/v1.93.0"
}

required_version = "= 1.12.2"
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -25,6 +25,6 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:gke-persistent-volume/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:gke-persistent-volume/v1.93.0"
}
}
2 changes: 1 addition & 1 deletion modules/file-system/gke-storage/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ terraform {
required_version = "= 1.12.2"

provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:gke-storage/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:gke-storage/v1.93.0"
}
}
4 changes: 2 additions & 2 deletions modules/file-system/managed-lustre/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:managed-lustre/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:managed-lustre/v1.93.0"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:managed-lustre/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:managed-lustre/v1.93.0"
}

required_version = "= 1.12.2"
Expand Down
4 changes: 2 additions & 2 deletions modules/file-system/netapp-storage-pool/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:netapp-storage-pool/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:netapp-storage-pool/v1.93.0"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:netapp-storage-pool/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:netapp-storage-pool/v1.93.0"
}

required_version = "= 1.12.2"
Expand Down
4 changes: 2 additions & 2 deletions modules/file-system/netapp-volume/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:netapp-volume/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:netapp-volume/v1.93.0"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:netapp-volume/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:netapp-volume/v1.93.0"
}

required_version = "= 1.12.2"
Expand Down
2 changes: 1 addition & 1 deletion modules/management/kubectl-apply/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:kubectl-apply/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:kubectl-apply/v1.93.0"
}

required_version = "= 1.12.2"
Expand Down
2 changes: 1 addition & 1 deletion modules/monitoring/dashboard/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:dashboard/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:dashboard/v1.93.0"
}

required_version = "= 1.12.2"
Expand Down
2 changes: 1 addition & 1 deletion modules/network/firewall-rules/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:firewall-rules/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:firewall-rules/v1.93.0"
}

required_version = "= 1.12.2"
Expand Down
2 changes: 1 addition & 1 deletion modules/network/pre-existing-subnetwork/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:pre-existing-subnetwork/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:pre-existing-subnetwork/v1.93.0"
}

required_version = "= 1.12.2"
Expand Down
2 changes: 1 addition & 1 deletion modules/network/pre-existing-vpc/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:pre-existing-vpc/v1.92.0"
module_name = "blueprints/terraform/hpc-toolkit:pre-existing-vpc/v1.93.0"
}

required_version = "= 1.12.2"
Expand Down
Loading
Loading