From cb11e54c8af6a596e22c41a5cdf7abfcb429678d Mon Sep 17 00:00:00 2001 From: Siddhartha Tamatam Date: Tue, 30 Jun 2026 10:04:18 +0000 Subject: [PATCH 1/2] Increase version to 1.96.0 --- community/modules/compute/gke-nodeset/versions.tf | 2 +- community/modules/compute/gke-partition/versions.tf | 2 +- community/modules/compute/htcondor-execute-point/versions.tf | 2 +- community/modules/compute/mig/versions.tf | 2 +- .../compute/schedmd-slurm-gcp-v6-nodeset-dynamic/versions.tf | 2 +- .../compute/schedmd-slurm-gcp-v6-nodeset-tpu/versions.tf | 2 +- .../modules/compute/schedmd-slurm-gcp-v6-nodeset/versions.tf | 2 +- .../compute/schedmd-slurm-gcp-v6-partition/versions.tf | 2 +- .../modules/database/slurm-cloudsql-federation/versions.tf | 4 ++-- community/modules/file-system/nfs-server/versions.tf | 2 +- community/modules/files/fsi-montecarlo-on-batch/versions.tf | 4 ++-- community/modules/internal/slurm-gcp/login/versions.tf | 2 +- community/modules/project/service-enablement/versions.tf | 2 +- community/modules/pubsub/bigquery-sub/versions.tf | 4 ++-- community/modules/pubsub/topic/versions.tf | 2 +- community/modules/scheduler/htcondor-access-point/versions.tf | 2 +- .../modules/scheduler/htcondor-central-manager/versions.tf | 2 +- community/modules/scheduler/htcondor-pool-secrets/versions.tf | 2 +- .../scheduler/schedmd-slurm-gcp-v6-controller/versions.tf | 2 +- .../modules/scheduler/schedmd-slurm-gcp-v6-login/versions.tf | 2 +- community/modules/scripts/wait-for-startup/versions.tf | 2 +- community/modules/scripts/windows-startup-script/versions.tf | 2 +- modules/compute/gke-node-pool/versions.tf | 4 ++-- modules/compute/resource-policy/versions.tf | 2 +- modules/compute/vm-instance/versions.tf | 4 ++-- modules/file-system/cloud-storage-bucket/versions.tf | 4 ++-- modules/file-system/filestore/versions.tf | 4 ++-- modules/file-system/gke-persistent-volume/versions.tf | 2 +- modules/file-system/gke-storage/versions.tf | 2 +- modules/file-system/managed-lustre/versions.tf | 4 ++-- modules/file-system/netapp-storage-pool/versions.tf | 4 ++-- modules/file-system/netapp-volume/versions.tf | 4 ++-- modules/management/kubectl-apply/versions.tf | 2 +- modules/monitoring/dashboard/versions.tf | 2 +- modules/network/firewall-rules/versions.tf | 2 +- modules/network/pre-existing-subnetwork/versions.tf | 2 +- modules/network/pre-existing-vpc/versions.tf | 2 +- modules/network/private-service-access/versions.tf | 4 ++-- modules/scheduler/batch-login-node/versions.tf | 2 +- modules/scheduler/gke-cluster/versions.tf | 4 ++-- modules/scheduler/pre-existing-gke-cluster/versions.tf | 2 +- modules/scripts/startup-script/versions.tf | 2 +- pkg/config/config.go | 2 +- 43 files changed, 55 insertions(+), 55 deletions(-) diff --git a/community/modules/compute/gke-nodeset/versions.tf b/community/modules/compute/gke-nodeset/versions.tf index 1ce6f1547c..19fa997279 100644 --- a/community/modules/compute/gke-nodeset/versions.tf +++ b/community/modules/compute/gke-nodeset/versions.tf @@ -22,6 +22,6 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:gke-nodeset/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:gke-nodeset/v1.96.0" } } diff --git a/community/modules/compute/gke-partition/versions.tf b/community/modules/compute/gke-partition/versions.tf index c7612bfe65..bc66df4322 100644 --- a/community/modules/compute/gke-partition/versions.tf +++ b/community/modules/compute/gke-partition/versions.tf @@ -22,6 +22,6 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:gke-partition/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:gke-partition/v1.96.0" } } diff --git a/community/modules/compute/htcondor-execute-point/versions.tf b/community/modules/compute/htcondor-execute-point/versions.tf index 6914210a89..fb1d38473e 100644 --- a/community/modules/compute/htcondor-execute-point/versions.tf +++ b/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.95.0" + module_name = "blueprints/terraform/hpc-toolkit:htcondor-execute-point/v1.96.0" } } diff --git a/community/modules/compute/mig/versions.tf b/community/modules/compute/mig/versions.tf index 117c8c2497..abf9500257 100644 --- a/community/modules/compute/mig/versions.tf +++ b/community/modules/compute/mig/versions.tf @@ -22,6 +22,6 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:mig/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:mig/v1.96.0" } } diff --git a/community/modules/compute/schedmd-slurm-gcp-v6-nodeset-dynamic/versions.tf b/community/modules/compute/schedmd-slurm-gcp-v6-nodeset-dynamic/versions.tf index c6a512c72c..fafb758827 100644 --- a/community/modules/compute/schedmd-slurm-gcp-v6-nodeset-dynamic/versions.tf +++ b/community/modules/compute/schedmd-slurm-gcp-v6-nodeset-dynamic/versions.tf @@ -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.95.0" + module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-dynamic/v1.96.0" } } diff --git a/community/modules/compute/schedmd-slurm-gcp-v6-nodeset-tpu/versions.tf b/community/modules/compute/schedmd-slurm-gcp-v6-nodeset-tpu/versions.tf index 0e6fe7853a..ca7ee7f981 100644 --- a/community/modules/compute/schedmd-slurm-gcp-v6-nodeset-tpu/versions.tf +++ b/community/modules/compute/schedmd-slurm-gcp-v6-nodeset-tpu/versions.tf @@ -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.95.0" + module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-tpu/v1.96.0" } } diff --git a/community/modules/compute/schedmd-slurm-gcp-v6-nodeset/versions.tf b/community/modules/compute/schedmd-slurm-gcp-v6-nodeset/versions.tf index 04d8c03f36..5707c11add 100644 --- a/community/modules/compute/schedmd-slurm-gcp-v6-nodeset/versions.tf +++ b/community/modules/compute/schedmd-slurm-gcp-v6-nodeset/versions.tf @@ -24,6 +24,6 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset/v1.96.0" } } diff --git a/community/modules/compute/schedmd-slurm-gcp-v6-partition/versions.tf b/community/modules/compute/schedmd-slurm-gcp-v6-partition/versions.tf index 77f0727c43..f291e96cb2 100644 --- a/community/modules/compute/schedmd-slurm-gcp-v6-partition/versions.tf +++ b/community/modules/compute/schedmd-slurm-gcp-v6-partition/versions.tf @@ -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.95.0" + module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-partition/v1.96.0" } } diff --git a/community/modules/database/slurm-cloudsql-federation/versions.tf b/community/modules/database/slurm-cloudsql-federation/versions.tf index a10dcad632..c64ef95022 100644 --- a/community/modules/database/slurm-cloudsql-federation/versions.tf +++ b/community/modules/database/slurm-cloudsql-federation/versions.tf @@ -26,10 +26,10 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.96.0" } provider_meta "google-beta" { - module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.96.0" } required_version = ">= 1.12.2" diff --git a/community/modules/file-system/nfs-server/versions.tf b/community/modules/file-system/nfs-server/versions.tf index 6b2160c2fd..115401ea95 100644 --- a/community/modules/file-system/nfs-server/versions.tf +++ b/community/modules/file-system/nfs-server/versions.tf @@ -30,7 +30,7 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:nfs-server/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:nfs-server/v1.96.0" } required_version = ">= 1.12.2" diff --git a/community/modules/files/fsi-montecarlo-on-batch/versions.tf b/community/modules/files/fsi-montecarlo-on-batch/versions.tf index f8c1a2aedd..355fa8e4bd 100644 --- a/community/modules/files/fsi-montecarlo-on-batch/versions.tf +++ b/community/modules/files/fsi-montecarlo-on-batch/versions.tf @@ -35,9 +35,9 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:fsi-montecarlo-on-batch/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:fsi-montecarlo-on-batch/v1.96.0" } provider_meta "google-beta" { - module_name = "blueprints/terraform/hpc-toolkit:fsi-montecarlo-on-batch/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:fsi-montecarlo-on-batch/v1.96.0" } } diff --git a/community/modules/internal/slurm-gcp/login/versions.tf b/community/modules/internal/slurm-gcp/login/versions.tf index 91d146513f..30786ca4ad 100644 --- a/community/modules/internal/slurm-gcp/login/versions.tf +++ b/community/modules/internal/slurm-gcp/login/versions.tf @@ -24,6 +24,6 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-login/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-login/v1.96.0" } } diff --git a/community/modules/project/service-enablement/versions.tf b/community/modules/project/service-enablement/versions.tf index 6fa22b2914..15b2c7b3a4 100644 --- a/community/modules/project/service-enablement/versions.tf +++ b/community/modules/project/service-enablement/versions.tf @@ -22,7 +22,7 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:service-enablement/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:service-enablement/v1.96.0" } required_version = ">= 1.12.2" diff --git a/community/modules/pubsub/bigquery-sub/versions.tf b/community/modules/pubsub/bigquery-sub/versions.tf index 5ff340d2bc..f65cb02ad7 100644 --- a/community/modules/pubsub/bigquery-sub/versions.tf +++ b/community/modules/pubsub/bigquery-sub/versions.tf @@ -26,10 +26,10 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.96.0" } provider_meta "google-beta" { - module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.96.0" } required_version = ">= 1.12.2" } diff --git a/community/modules/pubsub/topic/versions.tf b/community/modules/pubsub/topic/versions.tf index 5e3c69acae..2f5c8069dd 100644 --- a/community/modules/pubsub/topic/versions.tf +++ b/community/modules/pubsub/topic/versions.tf @@ -27,6 +27,6 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:topic/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:topic/v1.96.0" } } diff --git a/community/modules/scheduler/htcondor-access-point/versions.tf b/community/modules/scheduler/htcondor-access-point/versions.tf index 9b0358e18c..d4e50822da 100644 --- a/community/modules/scheduler/htcondor-access-point/versions.tf +++ b/community/modules/scheduler/htcondor-access-point/versions.tf @@ -30,7 +30,7 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:htcondor-access-point/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:htcondor-access-point/v1.96.0" } required_version = ">= 1.12.2" diff --git a/community/modules/scheduler/htcondor-central-manager/versions.tf b/community/modules/scheduler/htcondor-central-manager/versions.tf index 64019baeb0..0ac73ee216 100644 --- a/community/modules/scheduler/htcondor-central-manager/versions.tf +++ b/community/modules/scheduler/htcondor-central-manager/versions.tf @@ -26,7 +26,7 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:htcondor-central-manager/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:htcondor-central-manager/v1.96.0" } required_version = ">= 1.12.2" diff --git a/community/modules/scheduler/htcondor-pool-secrets/versions.tf b/community/modules/scheduler/htcondor-pool-secrets/versions.tf index d347227c65..6115c9d0a5 100644 --- a/community/modules/scheduler/htcondor-pool-secrets/versions.tf +++ b/community/modules/scheduler/htcondor-pool-secrets/versions.tf @@ -26,7 +26,7 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:htcondor-pool-secrets/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:htcondor-pool-secrets/v1.96.0" } required_version = ">= 1.12.2" diff --git a/community/modules/scheduler/schedmd-slurm-gcp-v6-controller/versions.tf b/community/modules/scheduler/schedmd-slurm-gcp-v6-controller/versions.tf index 5804b339b4..af0913fd4e 100644 --- a/community/modules/scheduler/schedmd-slurm-gcp-v6-controller/versions.tf +++ b/community/modules/scheduler/schedmd-slurm-gcp-v6-controller/versions.tf @@ -28,6 +28,6 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-controller/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-controller/v1.96.0" } } diff --git a/community/modules/scheduler/schedmd-slurm-gcp-v6-login/versions.tf b/community/modules/scheduler/schedmd-slurm-gcp-v6-login/versions.tf index abe5914967..a4a4585ad6 100644 --- a/community/modules/scheduler/schedmd-slurm-gcp-v6-login/versions.tf +++ b/community/modules/scheduler/schedmd-slurm-gcp-v6-login/versions.tf @@ -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.95.0" + module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-login/v1.96.0" } } diff --git a/community/modules/scripts/wait-for-startup/versions.tf b/community/modules/scripts/wait-for-startup/versions.tf index 3f928c262d..9b67b09ecf 100644 --- a/community/modules/scripts/wait-for-startup/versions.tf +++ b/community/modules/scripts/wait-for-startup/versions.tf @@ -22,7 +22,7 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:wait-for-startup/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:wait-for-startup/v1.96.0" } required_version = ">= 1.12.2" diff --git a/community/modules/scripts/windows-startup-script/versions.tf b/community/modules/scripts/windows-startup-script/versions.tf index 62d25d564b..cb110cae3a 100644 --- a/community/modules/scripts/windows-startup-script/versions.tf +++ b/community/modules/scripts/windows-startup-script/versions.tf @@ -16,7 +16,7 @@ terraform { provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:windows-startup-script/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:windows-startup-script/v1.96.0" } required_version = ">= 1.12.2" diff --git a/modules/compute/gke-node-pool/versions.tf b/modules/compute/gke-node-pool/versions.tf index a267ed81f6..c495462ff6 100644 --- a/modules/compute/gke-node-pool/versions.tf +++ b/modules/compute/gke-node-pool/versions.tf @@ -30,9 +30,9 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:gke-node-pool/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:gke-node-pool/v1.96.0" } provider_meta "google-beta" { - module_name = "blueprints/terraform/hpc-toolkit:gke-node-pool/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:gke-node-pool/v1.96.0" } } diff --git a/modules/compute/resource-policy/versions.tf b/modules/compute/resource-policy/versions.tf index 61a3c8680e..0c0c1220e4 100644 --- a/modules/compute/resource-policy/versions.tf +++ b/modules/compute/resource-policy/versions.tf @@ -27,7 +27,7 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:resource-policy/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:resource-policy/v1.96.0" } required_version = ">= 1.12.2" diff --git a/modules/compute/vm-instance/versions.tf b/modules/compute/vm-instance/versions.tf index be9dd37e6b..5859dc418a 100644 --- a/modules/compute/vm-instance/versions.tf +++ b/modules/compute/vm-instance/versions.tf @@ -31,10 +31,10 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:vm-instance/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:vm-instance/v1.96.0" } provider_meta "google-beta" { - module_name = "blueprints/terraform/hpc-toolkit:vm-instance/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:vm-instance/v1.96.0" } required_version = ">= 1.12.2" diff --git a/modules/file-system/cloud-storage-bucket/versions.tf b/modules/file-system/cloud-storage-bucket/versions.tf index 2849a4576e..39c9484fa1 100644 --- a/modules/file-system/cloud-storage-bucket/versions.tf +++ b/modules/file-system/cloud-storage-bucket/versions.tf @@ -30,10 +30,10 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:cloud-storage-bucket/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:cloud-storage-bucket/v1.96.0" } provider_meta "google-beta" { - module_name = "blueprints/terraform/hpc-toolkit:cloud-storage-bucket/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:cloud-storage-bucket/v1.96.0" } required_version = ">= 1.12.2" } diff --git a/modules/file-system/filestore/versions.tf b/modules/file-system/filestore/versions.tf index fec004f446..9cb09e219d 100644 --- a/modules/file-system/filestore/versions.tf +++ b/modules/file-system/filestore/versions.tf @@ -26,10 +26,10 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:filestore/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:filestore/v1.96.0" } provider_meta "google-beta" { - module_name = "blueprints/terraform/hpc-toolkit:filestore/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:filestore/v1.96.0" } required_version = ">= 1.12.2" diff --git a/modules/file-system/gke-persistent-volume/versions.tf b/modules/file-system/gke-persistent-volume/versions.tf index 0d38a97134..86d5dedd8f 100644 --- a/modules/file-system/gke-persistent-volume/versions.tf +++ b/modules/file-system/gke-persistent-volume/versions.tf @@ -25,6 +25,6 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:gke-persistent-volume/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:gke-persistent-volume/v1.96.0" } } diff --git a/modules/file-system/gke-storage/versions.tf b/modules/file-system/gke-storage/versions.tf index 44604522eb..05482428b2 100644 --- a/modules/file-system/gke-storage/versions.tf +++ b/modules/file-system/gke-storage/versions.tf @@ -16,6 +16,6 @@ terraform { required_version = ">= 1.12.2" provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:gke-storage/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:gke-storage/v1.96.0" } } diff --git a/modules/file-system/managed-lustre/versions.tf b/modules/file-system/managed-lustre/versions.tf index e5cdc1f5d4..ad0635c88c 100644 --- a/modules/file-system/managed-lustre/versions.tf +++ b/modules/file-system/managed-lustre/versions.tf @@ -26,10 +26,10 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:managed-lustre/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:managed-lustre/v1.96.0" } provider_meta "google-beta" { - module_name = "blueprints/terraform/hpc-toolkit:managed-lustre/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:managed-lustre/v1.96.0" } required_version = ">= 1.12.2" diff --git a/modules/file-system/netapp-storage-pool/versions.tf b/modules/file-system/netapp-storage-pool/versions.tf index e5c12779c0..399215640e 100644 --- a/modules/file-system/netapp-storage-pool/versions.tf +++ b/modules/file-system/netapp-storage-pool/versions.tf @@ -27,10 +27,10 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:netapp-storage-pool/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:netapp-storage-pool/v1.96.0" } provider_meta "google-beta" { - module_name = "blueprints/terraform/hpc-toolkit:netapp-storage-pool/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:netapp-storage-pool/v1.96.0" } required_version = ">= 1.12.2" diff --git a/modules/file-system/netapp-volume/versions.tf b/modules/file-system/netapp-volume/versions.tf index e28407af0c..96a169c8dd 100644 --- a/modules/file-system/netapp-volume/versions.tf +++ b/modules/file-system/netapp-volume/versions.tf @@ -22,10 +22,10 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:netapp-volume/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:netapp-volume/v1.96.0" } provider_meta "google-beta" { - module_name = "blueprints/terraform/hpc-toolkit:netapp-volume/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:netapp-volume/v1.96.0" } required_version = ">= 1.12.2" diff --git a/modules/management/kubectl-apply/versions.tf b/modules/management/kubectl-apply/versions.tf index ecb4837911..e104f16af7 100644 --- a/modules/management/kubectl-apply/versions.tf +++ b/modules/management/kubectl-apply/versions.tf @@ -39,7 +39,7 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:kubectl-apply/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:kubectl-apply/v1.96.0" } required_version = ">= 1.12.2" diff --git a/modules/monitoring/dashboard/versions.tf b/modules/monitoring/dashboard/versions.tf index 47a4832b45..4e5f788224 100644 --- a/modules/monitoring/dashboard/versions.tf +++ b/modules/monitoring/dashboard/versions.tf @@ -22,7 +22,7 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:dashboard/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:dashboard/v1.96.0" } required_version = ">= 1.12.2" diff --git a/modules/network/firewall-rules/versions.tf b/modules/network/firewall-rules/versions.tf index e24d59ca56..f8a79270e8 100644 --- a/modules/network/firewall-rules/versions.tf +++ b/modules/network/firewall-rules/versions.tf @@ -22,7 +22,7 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:firewall-rules/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:firewall-rules/v1.96.0" } required_version = ">= 1.12.2" diff --git a/modules/network/pre-existing-subnetwork/versions.tf b/modules/network/pre-existing-subnetwork/versions.tf index 8fcff97ac9..8c49479338 100644 --- a/modules/network/pre-existing-subnetwork/versions.tf +++ b/modules/network/pre-existing-subnetwork/versions.tf @@ -22,7 +22,7 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:pre-existing-subnetwork/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:pre-existing-subnetwork/v1.96.0" } required_version = ">= 1.12.2" diff --git a/modules/network/pre-existing-vpc/versions.tf b/modules/network/pre-existing-vpc/versions.tf index daf7decf26..3151ae83c5 100644 --- a/modules/network/pre-existing-vpc/versions.tf +++ b/modules/network/pre-existing-vpc/versions.tf @@ -22,7 +22,7 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:pre-existing-vpc/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:pre-existing-vpc/v1.96.0" } required_version = ">= 1.12.2" diff --git a/modules/network/private-service-access/versions.tf b/modules/network/private-service-access/versions.tf index 450fd53c55..19641b7b5b 100644 --- a/modules/network/private-service-access/versions.tf +++ b/modules/network/private-service-access/versions.tf @@ -26,11 +26,11 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:private-service-access/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:private-service-access/v1.96.0" } provider_meta "google-beta" { - module_name = "blueprints/terraform/hpc-toolkit:private-service-access/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:private-service-access/v1.96.0" } required_version = ">= 1.12.2" diff --git a/modules/scheduler/batch-login-node/versions.tf b/modules/scheduler/batch-login-node/versions.tf index f1dc9ad7c4..510b674c32 100644 --- a/modules/scheduler/batch-login-node/versions.tf +++ b/modules/scheduler/batch-login-node/versions.tf @@ -22,7 +22,7 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:batch-login-node/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:batch-login-node/v1.96.0" } required_version = ">= 1.12.2" diff --git a/modules/scheduler/gke-cluster/versions.tf b/modules/scheduler/gke-cluster/versions.tf index 50f3d2c336..b1d97cbc08 100644 --- a/modules/scheduler/gke-cluster/versions.tf +++ b/modules/scheduler/gke-cluster/versions.tf @@ -30,10 +30,10 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:gke-cluster/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:gke-cluster/v1.96.0" } provider_meta "google-beta" { - module_name = "blueprints/terraform/hpc-toolkit:gke-cluster/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:gke-cluster/v1.96.0" } } diff --git a/modules/scheduler/pre-existing-gke-cluster/versions.tf b/modules/scheduler/pre-existing-gke-cluster/versions.tf index fe76d70d6b..6db0c9b0f8 100644 --- a/modules/scheduler/pre-existing-gke-cluster/versions.tf +++ b/modules/scheduler/pre-existing-gke-cluster/versions.tf @@ -23,7 +23,7 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:pre-existing-gke-cluster/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:pre-existing-gke-cluster/v1.96.0" } required_version = ">= 1.12.2" diff --git a/modules/scripts/startup-script/versions.tf b/modules/scripts/startup-script/versions.tf index b47a1e542a..c1b555a7f1 100644 --- a/modules/scripts/startup-script/versions.tf +++ b/modules/scripts/startup-script/versions.tf @@ -30,7 +30,7 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/hpc-toolkit:startup-script/v1.95.0" + module_name = "blueprints/terraform/hpc-toolkit:startup-script/v1.96.0" } required_version = ">= 1.12.2" diff --git a/pkg/config/config.go b/pkg/config/config.go index fe3f6cb9b3..30eac1b099 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -44,7 +44,7 @@ import ( const ( maxHintDist int = 3 // Maximum Levenshtein distance where we suggest a hint - latestToolkitVersion = "v1.95.0" + latestToolkitVersion = "v1.96.0" // SharedModulesDirName is the name of the shared directory for embedded modules SharedModulesDirName = "_modules" ) From 15ec7c659e870f0e960cc1e6c58c0953cec39a72 Mon Sep 17 00:00:00 2001 From: Swarna Bharathi Mantena Date: Wed, 1 Jul 2026 20:42:45 +0530 Subject: [PATCH 2/2] Fix(gke): use full accelerator type for pathways platform mapping (#5884) --- .../gke/gke_job_orchestrator_test.go | 80 +++++++++++++++++++ pkg/orchestrator/gke/manifest_generator.go | 5 +- 2 files changed, 81 insertions(+), 4 deletions(-) diff --git a/pkg/orchestrator/gke/gke_job_orchestrator_test.go b/pkg/orchestrator/gke/gke_job_orchestrator_test.go index 0ccb6537ec..a4cebb080f 100644 --- a/pkg/orchestrator/gke/gke_job_orchestrator_test.go +++ b/pkg/orchestrator/gke/gke_job_orchestrator_test.go @@ -2418,3 +2418,83 @@ func TestGeneratePathwaysManifest_CustomEnv(t *testing.T) { } } } + +func TestPrepareManifestOptions_PathwaysPlatform(t *testing.T) { + setupMockMachineConfig(t) + tests := []struct { + computeType string + topology string + wantPlatform string + }{ + { + computeType: "tpu-v5-lite-podslice", + topology: "16x16", + wantPlatform: "tpuv5e:16x16", + }, + { + computeType: "v5litepod", + topology: "8x8", + wantPlatform: "tpuv5e:8x8", + }, + { + computeType: "tpu-v6e-slice", + topology: "4x4", + wantPlatform: "tpuv6e:4x4", + }, + { + computeType: "v6e", + topology: "4x4", + wantPlatform: "tpuv6e:4x4", + }, + { + computeType: "tpu-v5p-slice", + topology: "2x2x2", + wantPlatform: "tpuv5:2x2x2", + }, + { + computeType: "v5p", + topology: "2x2x2", + wantPlatform: "tpuv5:2x2x2", + }, + } + + for _, tc := range tests { + t.Run(tc.computeType, func(t *testing.T) { + job := orchestrator.JobDefinition{ + WorkloadName: "pathways-test-job", + CommandToRun: "echo hello", + ComputeType: tc.computeType, + ClusterLocation: "us-central1-a", + IsPathwaysJob: true, + Topology: tc.topology, + } + + mockResponses := map[string][]shell.CommandResult{ + "kubectl get resourceflavors": {{ExitCode: 0, Stdout: ""}}, + "kubectl get nodes -o jsonpath={range .items[*]}{.metadata.labels.cloud\\.google\\.com/gke-tpu-topology}{\"\\n\"}{end}": {{ExitCode: 0, Stdout: tc.topology}}, + "gcloud compute machine-types describe " + tc.computeType + " --zone=us-central1-a --format=json": {{ExitCode: 0, Stdout: `{"accelerators": [{"guestAcceleratorCount": 4, "guestAcceleratorType": "` + tc.computeType + `"}]}`}}, + } + + mockExec := NewMockExecutor(mockResponses) + orc := newTestGKEOrchestrator(mockExec) + orc.projectID = "mock-project" + orc.clusterDesc.NodePools = []gkeJobNodePool{ + {Config: gkeNodePoolConfig{MachineType: tc.computeType}}, + } + + profile, isDynamicSlicing, isStaticSlicing, err := orc.resolveHardwareRequirements(&job) + if err != nil { + t.Fatalf("resolveHardwareRequirements failed: %v", err) + } + + opts, err := orc.PrepareManifestOptions(job, "test-image:latest", profile, isDynamicSlicing, isStaticSlicing) + if err != nil { + t.Fatalf("PrepareManifestOptions failed: %v", err) + } + + if opts.PathwaysInstanceType != tc.wantPlatform { + t.Errorf("PathwaysInstanceType = %q, want %q", opts.PathwaysInstanceType, tc.wantPlatform) + } + }) + } +} diff --git a/pkg/orchestrator/gke/manifest_generator.go b/pkg/orchestrator/gke/manifest_generator.go index 665add751f..c6370a9054 100644 --- a/pkg/orchestrator/gke/manifest_generator.go +++ b/pkg/orchestrator/gke/manifest_generator.go @@ -121,12 +121,9 @@ func (g *GKEOrchestrator) PrepareManifestOptions(job orchestrator.JobDefinition, IsStaticSlicing: isStaticSlicing, } - parts := strings.Split(originalAccelType, "-") - instanceType := parts[0] - // Reuse GCluster's existing GKE accelerator label mapping and algorithmically // derive the Pathways short platform key to avoid duplicating mapping tables. - gkeLabel := g.GenerateGKENodeSelectorLabel(instanceType) + gkeLabel := g.GenerateGKENodeSelectorLabel(originalAccelType) // Normalize GKE node selector labels to match JAX/Pathways platform keys: // 1. Map GKE "v5-lite" (TPU v5e) to JAX standard "v5e" (deriving tpuv5e) // 2. Map GKE "v5p" (TPU v5p) to JAX standard "v5" (deriving tpuv5)