Skip to content

Merge V1.69.0 into Develop #4773

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
ankitkumar-quad merged 7 commits into from
Oct 21, 2025
Merged

Merge V1.69.0 into Develop #4773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c2c64e7
Merge pull request #4747 from arpit974/a3ultrs-vm-imageUpdate
arpit974 Oct 9, 2025
2dbc931
Increase version to 1.69.0
ankitkumar-quad Oct 16, 2025
41630ae
Merge pull request #4767 from GoogleCloudPlatform/version/v1.69.0
ankitkumar-quad Oct 16, 2025
4cfa2bd
Merge pull request #4766 from agrawalkhushi18/v7x-blueprint
agrawalkhushi18 Oct 16, 2025
2e7e2f9
Merge branch 'GoogleCloudPlatform:main' into release-pr
ankitkumar-quad Oct 17, 2025
80fe5ae
Merge pull request #4769 from ankitkumar-quad/release-pr
ankitkumar-quad Oct 17, 2025
18a9e07
Merge pull request #4768 from GoogleCloudPlatform/release-candidate
ankitkumar-quad Oct 21, 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.68.0",
Version: "v1.69.0",
Annotations: annotation,
}
)
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.68.0"
module_name = "blueprints/terraform/hpc-toolkit:htcondor-execute-point/v1.69.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.68.0"
module_name = "blueprints/terraform/hpc-toolkit:mig/v1.69.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.3"
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-dynamic/v1.68.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-dynamic/v1.69.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.3"

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

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

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.68.0"
module_name = "blueprints/terraform/hpc-toolkit:cloud-storage-bucket/v1.69.0"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:cloud-storage-bucket/v1.68.0"
module_name = "blueprints/terraform/hpc-toolkit:cloud-storage-bucket/v1.69.0"
}
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.68.0"
module_name = "blueprints/terraform/hpc-toolkit:nfs-server/v1.69.0"
}

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.68.0"
module_name = "blueprints/terraform/hpc-toolkit:fsi-montecarlo-on-batch/v1.69.0"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:fsi-montecarlo-on-batch/v1.68.0"
module_name = "blueprints/terraform/hpc-toolkit:fsi-montecarlo-on-batch/v1.69.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-controller/v1.68.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-controller/v1.69.0"
}
}
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 @@ -26,11 +26,11 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:private-service-access/v1.68.0"
module_name = "blueprints/terraform/hpc-toolkit:private-service-access/v1.69.0"
}

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

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.68.0"
module_name = "blueprints/terraform/hpc-toolkit:service-enablement/v1.69.0"
}

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

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.68.0"
module_name = "blueprints/terraform/hpc-toolkit:htcondor-central-manager/v1.69.0"
}

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.68.0"
module_name = "blueprints/terraform/hpc-toolkit:htcondor-pool-secrets/v1.69.0"
}

required_version = ">= 1.3.0"
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.68.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-controller/v1.69.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.3"

provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-login/v1.68.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-login/v1.69.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.68.0"
module_name = "blueprints/terraform/hpc-toolkit:wait-for-startup/v1.69.0"
}

required_version = ">= 0.14.0"
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.68.0"
module_name = "blueprints/terraform/hpc-toolkit:windows-startup-script/v1.69.0"
}

required_version = ">= 0.14.0"
Expand Down
6 changes: 4 additions & 2 deletions modules/compute/gke-node-pool/reservation_definitions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ locals {
input_reservation_projects = [for r in try(var.reservation_affinity.specific_reservations, []) : coalesce(r.project, var.project_id)]
# We, also, remember the suffix "/reservationBlocks/exr-one-block-1" for use elsewhere afterwards
input_reservation_suffixes = [for r in try(var.reservation_affinity.specific_reservations, []) : substr(r.name, length(split("/", r.name)[0]), -1)]
# Adding this variable to by-pass the machine-type validation for TPUs
is_tpu = var.placement_policy.tpu_topology != null
}

data "google_compute_reservation" "specific_reservations" {
Expand Down Expand Up @@ -56,9 +58,9 @@ locals {
verified_specific_reservations = [for k, v in data.google_compute_reservation.specific_reservations : v if(v.specific_reservation != null && v.specific_reservation_required == true)]

# Build two maps to be used to compare the VM properties between reservations and the node pool
# Skip this for TPUs
# Validation of only machine-type for CPUs and and both machine-type and guest-accelerators for GPUs
reservation_vm_properties = [for reservation in local.verified_specific_reservations : {
# Skip this for TPUs ( returns an empty list to skip the machine-type validation for aggregate TPU reservations)
reservation_vm_properties = local.is_tpu ? [] : [for reservation in local.verified_specific_reservations : {
"machine_type" : try(reservation.specific_reservation[0].instance_properties[0].machine_type, "")
"guest_accelerators" : local.has_gpu ? ( # Conditional check for GPUs
{ for acc in try(reservation.specific_reservation[0].instance_properties[0].guest_accelerators, []) : acc.accelerator_type => acc.accelerator_count }
Expand Down
2 changes: 1 addition & 1 deletion 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,7 +30,7 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:gke-node-pool/v1.68.0"
module_name = "blueprints/terraform/hpc-toolkit:gke-node-pool/v1.69.0"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:gke-node-pool/v1.45.0"
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.68.0"
module_name = "blueprints/terraform/hpc-toolkit:vm-instance/v1.69.0"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:vm-instance/v1.68.0"
module_name = "blueprints/terraform/hpc-toolkit:vm-instance/v1.69.0"
}

required_version = ">= 1.3.0"
Expand Down
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.68.0"
module_name = "blueprints/terraform/hpc-toolkit:filestore/v1.69.0"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:filestore/v1.68.0"
module_name = "blueprints/terraform/hpc-toolkit:filestore/v1.69.0"
}

required_version = ">= 1.3.0"
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.68.0"
module_name = "blueprints/terraform/hpc-toolkit:gke-persistent-volume/v1.69.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.5"

provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:gke-storage/v1.68.0"
module_name = "blueprints/terraform/hpc-toolkit:gke-storage/v1.69.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.68.0"
module_name = "blueprints/terraform/hpc-toolkit:managed-lustre/v1.69.0"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:managed-lustre/v1.68.0"
module_name = "blueprints/terraform/hpc-toolkit:managed-lustre/v1.69.0"
}

required_version = ">= 1.3.0"
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.68.0"
module_name = "blueprints/terraform/hpc-toolkit:dashboard/v1.69.0"
}

required_version = ">= 0.14.0"
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.68.0"
module_name = "blueprints/terraform/hpc-toolkit:firewall-rules/v1.69.0"
}

required_version = ">= 1.5"
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.68.0"
module_name = "blueprints/terraform/hpc-toolkit:pre-existing-subnetwork/v1.69.0"
}

required_version = ">= 1.5"
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.68.0"
module_name = "blueprints/terraform/hpc-toolkit:pre-existing-vpc/v1.69.0"
}

required_version = ">= 1.5"
Expand Down
2 changes: 1 addition & 1 deletion modules/scheduler/batch-login-node/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:batch-login-node/v1.68.0"
module_name = "blueprints/terraform/hpc-toolkit:batch-login-node/v1.69.0"
}

required_version = ">= 0.14.0"
Expand Down
2 changes: 1 addition & 1 deletion modules/scheduler/gke-cluster/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:gke-cluster/v1.68.0"
module_name = "blueprints/terraform/hpc-toolkit:gke-cluster/v1.69.0"
}

provider_meta "google-beta" {
Expand Down
2 changes: 1 addition & 1 deletion modules/scheduler/pre-existing-gke-cluster/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:pre-existing-gke-cluster/v1.68.0"
module_name = "blueprints/terraform/hpc-toolkit:pre-existing-gke-cluster/v1.69.0"
}

required_version = ">= 1.3"
Expand Down
2 changes: 1 addition & 1 deletion modules/scripts/startup-script/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:startup-script/v1.68.0"
module_name = "blueprints/terraform/hpc-toolkit:startup-script/v1.69.0"
}

required_version = ">= 1.5"
Expand Down
Loading