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

Merge v1.39.0 back into develop #3028

Merged
merged 7 commits into from
Sep 12, 2024
Merged

Merge v1.39.0 back into develop #3028

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
657c43e
Ensure that HCLS blueprint uses official release of Toolkit modules
tpdownes Sep 10, 2024
c98e23e
Ensure that Slurm TPU/MaxText blueprint uses official release of Tool…
tpdownes Sep 10, 2024
68490a2
Ensure that Slurm TPU blueprint uses official release of Toolkit modules
tpdownes Sep 10, 2024
2da10ac
Merge pull request #3018 from tpdownes/fix_hcls
nick-stroud Sep 11, 2024
602b989
Update version from v1.38.0 to v1.39.0
rohitramu Sep 11, 2024
3939d49
Merge pull request #3023 from rohitramu/roramu/update_version
rohitramu Sep 12, 2024
7699f5d
Merge pull request #3004 from GoogleCloudPlatform/release-candidate
rohitramu Sep 12, 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 @@ -53,7 +53,7 @@ HPC deployments on the Google Cloud Platform.`,
logging.Fatal("cmd.Help function failed: %s", err)
}
},
Version: "v1.38.0",
Version: "v1.39.0",
Annotations: annotation,
}
)
Expand Down
8 changes: 4 additions & 4 deletions community/examples/hpc-slurm6-tpu-maxtext.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ deployment_groups:
python3 MaxText/train.py MaxText/configs/base.yml run_name=<RUN_NAME> base_output_directory=${PWD}/output/ dataset_path=<STORAGE_BUCKET> async_checkpointing=False attention=<ATTENTION> steps=<STEPS>

- id: tpu_nodeset
source: ./community/modules/compute/schedmd-slurm-gcp-v6-nodeset-tpu
source: community/modules/compute/schedmd-slurm-gcp-v6-nodeset-tpu
use: [network]
settings:
node_type: v4-8
Expand All @@ -88,7 +88,7 @@ deployment_groups:
node_count_dynamic_max: 1

- id: tpu_partition
source: ./community/modules/compute/schedmd-slurm-gcp-v6-partition
source: community/modules/compute/schedmd-slurm-gcp-v6-partition
use: [tpu_nodeset]
settings:
partition_name: tpu
Expand All @@ -110,14 +110,14 @@ deployment_groups:
is_default: true

- id: slurm_login
source: ./community/modules/scheduler/schedmd-slurm-gcp-v6-login
source: community/modules/scheduler/schedmd-slurm-gcp-v6-login
use: [network]
settings:
enable_login_public_ips: true
machine_type: n2-standard-16

- id: slurm_controller
source: ./community/modules/scheduler/schedmd-slurm-gcp-v6-controller
source: community/modules/scheduler/schedmd-slurm-gcp-v6-controller
use:
- tpu_partition
- compute_partition
Expand Down
8 changes: 4 additions & 4 deletions community/examples/hpc-slurm6-tpu.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ deployment_groups:
source: modules/network/vpc

- id: tpu_nodeset
source: ./community/modules/compute/schedmd-slurm-gcp-v6-nodeset-tpu
source: community/modules/compute/schedmd-slurm-gcp-v6-nodeset-tpu
use: [network]
settings:
node_type: v3-8
Expand All @@ -45,20 +45,20 @@ deployment_groups:
node_count_dynamic_max: 1

- id: tpu_partition
source: ./community/modules/compute/schedmd-slurm-gcp-v6-partition
source: community/modules/compute/schedmd-slurm-gcp-v6-partition
use: [tpu_nodeset]
settings:
partition_name: tpu

- id: slurm_login
source: ./community/modules/scheduler/schedmd-slurm-gcp-v6-login
source: community/modules/scheduler/schedmd-slurm-gcp-v6-login
use: [network]
settings:
machine_type: n2-standard-4
enable_login_public_ips: true

- id: slurm_controller
source: ./community/modules/scheduler/schedmd-slurm-gcp-v6-controller
source: community/modules/scheduler/schedmd-slurm-gcp-v6-controller
use:
- tpu_partition
- slurm_login
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 @@ -25,6 +25,6 @@ terraform {
}

provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:htcondor-execute-point/v1.38.0"
module_name = "blueprints/terraform/hpc-toolkit:htcondor-execute-point/v1.39.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.38.0"
module_name = "blueprints/terraform/hpc-toolkit:mig/v1.39.0"
}
}
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.38.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-node-group/v1.39.0"
}
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.38.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-partition/v1.39.0"
}
required_version = ">= 0.13.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 @@ -24,6 +24,6 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-dynamic/v1.38.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-dynamic/v1.39.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.38.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-tpu/v1.39.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.38.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset/v1.39.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.38.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-partition/v1.39.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.38.0"
module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.39.0"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.38.0"
module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.39.0"
}

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.38.0"
module_name = "blueprints/terraform/hpc-toolkit:cloud-storage-bucket/v1.39.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.38.0"
module_name = "blueprints/terraform/hpc-toolkit:nfs-server/v1.39.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.38.0"
module_name = "blueprints/terraform/hpc-toolkit:fsi-montecarlo-on-batch/v1.39.0"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:fsi-montecarlo-on-batch/v1.38.0"
module_name = "blueprints/terraform/hpc-toolkit:fsi-montecarlo-on-batch/v1.39.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 @@ -30,11 +30,11 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:private-service-access/v1.38.0"
module_name = "blueprints/terraform/hpc-toolkit:private-service-access/v1.39.0"
}

provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:private-service-access/v1.38.0"
module_name = "blueprints/terraform/hpc-toolkit:private-service-access/v1.39.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.38.0"
module_name = "blueprints/terraform/hpc-toolkit:service-enablement/v1.39.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.38.0"
module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.39.0"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.38.0"
module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.39.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.38.0"
module_name = "blueprints/terraform/hpc-toolkit:topic/v1.39.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 @@ -26,7 +26,7 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:htcondor-access-point/v1.38.0"
module_name = "blueprints/terraform/hpc-toolkit:htcondor-access-point/v1.39.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 @@ -22,7 +22,7 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:htcondor-central-manager/v1.38.0"
module_name = "blueprints/terraform/hpc-toolkit:htcondor-central-manager/v1.39.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.38.0"
module_name = "blueprints/terraform/hpc-toolkit:htcondor-pool-secrets/v1.39.0"
}

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.38.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-controller/v1.39.0"
}
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.38.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-login/v1.39.0"
}
required_version = ">= 1.1"
}
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 @@ -24,6 +24,6 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-controller/v1.38.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-controller/v1.39.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 @@ -24,6 +24,6 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-login/v1.38.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-login/v1.39.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.38.0"
module_name = "blueprints/terraform/hpc-toolkit:wait-for-startup/v1.39.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.38.0"
module_name = "blueprints/terraform/hpc-toolkit:windows-startup-script/v1.39.0"
}

required_version = ">= 0.14.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/hcls-blueprint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,11 +329,11 @@ deployment_groups:
partition_name: gpu

- id: slurm_login
source: ./community/modules/scheduler/schedmd-slurm-gcp-v6-login
source: community/modules/scheduler/schedmd-slurm-gcp-v6-login
use: [network]

- id: slurm_controller
source: ./community/modules/scheduler/schedmd-slurm-gcp-v6-controller
source: community/modules/scheduler/schedmd-slurm-gcp-v6-controller
use:
- network
- compute_partition
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 @@ -26,6 +26,6 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:gke-node-pool/v1.38.0"
module_name = "blueprints/terraform/hpc-toolkit:gke-node-pool/v1.39.0"
}
}
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.38.0"
module_name = "blueprints/terraform/hpc-toolkit:vm-instance/v1.39.0"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:vm-instance/v1.38.0"
module_name = "blueprints/terraform/hpc-toolkit:vm-instance/v1.39.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.38.0"
module_name = "blueprints/terraform/hpc-toolkit:filestore/v1.39.0"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:filestore/v1.38.0"
module_name = "blueprints/terraform/hpc-toolkit:filestore/v1.39.0"
}

required_version = ">= 0.14.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 @@ -29,6 +29,6 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:gke-persistent-volume/v1.38.0"
module_name = "blueprints/terraform/hpc-toolkit:gke-persistent-volume/v1.39.0"
}
}
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.38.0"
module_name = "blueprints/terraform/hpc-toolkit:dashboard/v1.39.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.38.0"
module_name = "blueprints/terraform/hpc-toolkit:firewall-rules/v1.39.0"
}

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

required_version = ">= 0.14.0"
Expand Down
Loading
Loading