Skip to content

Commit

Permalink
Merge pull request #2812 from nick-stroud/fix-cloud-param
Browse files Browse the repository at this point in the history 
Hot fix to add defaults to cloud params
  • Loading branch information
@nick-stroud
nick-stroud committed Jul 26, 2024
2 parents da56862 + e760395 commit 493308e
Show file tree
Hide file tree
Showing 40 changed files with 51 additions and 51 deletions.
2 changes: 1 addition & 1 deletion cmd/root.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ HPC deployments on the Google Cloud Platform.`,
logging.Fatal("cmd.Help function failed: %s", err)
}
},
Version: "v1.36.0",
Version: "v1.36.1",
Annotations: annotation,
}
)
Expand Down
2 changes: 1 addition & 1 deletion community/modules/compute/gke-node-pool/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:gke-node-pool/v1.36.1"
}
}
2 changes: 1 addition & 1 deletion community/modules/compute/htcondor-execute-point/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:htcondor-execute-point/v1.36.1"
}
}
2 changes: 1 addition & 1 deletion community/modules/compute/mig/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:mig/v1.36.1"
}
}
2 changes: 1 addition & 1 deletion community/modules/compute/schedmd-slurm-gcp-v5-node-group/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-node-group/v1.36.1"
}
required_version = ">= 1.1"
}
2 changes: 1 addition & 1 deletion community/modules/compute/schedmd-slurm-gcp-v5-partition/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-partition/v1.36.1"
}
required_version = ">= 0.13.0"
}
2 changes: 1 addition & 1 deletion community/modules/compute/schedmd-slurm-gcp-v6-nodeset-dynamic/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-dynamic/v1.36.1"
}
}
2 changes: 1 addition & 1 deletion community/modules/compute/schedmd-slurm-gcp-v6-nodeset-tpu/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-tpu/v1.36.1"
}
}
2 changes: 1 addition & 1 deletion community/modules/compute/schedmd-slurm-gcp-v6-nodeset/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset/v1.36.1"
}
}
2 changes: 1 addition & 1 deletion community/modules/compute/schedmd-slurm-gcp-v6-partition/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-partition/v1.36.1"
}
}
4 changes: 2 additions & 2 deletions community/modules/database/slurm-cloudsql-federation/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.36.1"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.36.0"
module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.36.1"
}

required_version = ">= 0.13.0"
Expand Down
2 changes: 1 addition & 1 deletion community/modules/file-system/cloud-storage-bucket/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:cloud-storage-bucket/v1.36.1"
}
required_version = ">= 0.14.0"
}
2 changes: 1 addition & 1 deletion community/modules/file-system/gke-persistent-volume/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:gke-persistent-volume/v1.36.1"
}
}
2 changes: 1 addition & 1 deletion community/modules/file-system/nfs-server/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:nfs-server/v1.36.1"
}

required_version = ">= 0.14.0"
Expand Down
4 changes: 2 additions & 2 deletions community/modules/files/fsi-montecarlo-on-batch/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:fsi-montecarlo-on-batch/v1.36.1"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:fsi-montecarlo-on-batch/v1.36.0"
module_name = "blueprints/terraform/hpc-toolkit:fsi-montecarlo-on-batch/v1.36.1"
}
}
4 changes: 2 additions & 2 deletions community/modules/network/private-service-access/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:private-service-access/v1.36.1"
}

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

required_version = ">= 1.2"
Expand Down
2 changes: 1 addition & 1 deletion community/modules/project/service-enablement/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:service-enablement/v1.36.1"
}

required_version = ">= 0.14.0"
Expand Down
4 changes: 2 additions & 2 deletions community/modules/pubsub/bigquery-sub/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.36.1"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.36.0"
module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.36.1"
}
required_version = ">= 1.0"
}
2 changes: 1 addition & 1 deletion community/modules/pubsub/topic/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:topic/v1.36.1"
}
}
2 changes: 1 addition & 1 deletion community/modules/scheduler/gke-cluster/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ terraform {
}
}
provider_meta "google" {
module_name = "blueprints/terraform/hpc-toolkit:gke-cluster/v1.36.0"
module_name = "blueprints/terraform/hpc-toolkit:gke-cluster/v1.36.1"
}
}
2 changes: 1 addition & 1 deletion community/modules/scheduler/htcondor-access-point/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:htcondor-access-point/v1.36.1"
}

required_version = ">= 1.1"
Expand Down
2 changes: 1 addition & 1 deletion community/modules/scheduler/htcondor-central-manager/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:htcondor-central-manager/v1.36.1"
}

required_version = ">= 1.1.0"
Expand Down
2 changes: 1 addition & 1 deletion community/modules/scheduler/htcondor-pool-secrets/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:htcondor-pool-secrets/v1.36.1"
}

required_version = ">= 1.3.0"
Expand Down
2 changes: 1 addition & 1 deletion community/modules/scheduler/pre-existing-gke-cluster/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:pre-existing-gke-cluster/v1.36.1"
}

required_version = ">= 1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion community/modules/scheduler/schedmd-slurm-gcp-v5-controller/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-controller/v1.36.1"
}
required_version = ">= 1.1"
}
2 changes: 1 addition & 1 deletion community/modules/scheduler/schedmd-slurm-gcp-v5-login/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-login/v1.36.1"
}
required_version = ">= 1.1"
}
2 changes: 1 addition & 1 deletion community/modules/scheduler/schedmd-slurm-gcp-v6-controller/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ limitations under the License.
| <a name="input_bucket_name"></a> [bucket\_name](#input\_bucket\_name) | Name of GCS bucket.<br>Ignored when 'create\_bucket' is true. | `string` | `null` | no |
| <a name="input_can_ip_forward"></a> [can\_ip\_forward](#input\_can\_ip\_forward) | Enable IP forwarding, for NAT instances for example. | `bool` | `false` | no |
| <a name="input_cgroup_conf_tpl"></a> [cgroup\_conf\_tpl](#input\_cgroup\_conf\_tpl) | Slurm cgroup.conf template file path. | `string` | `null` | no |
| <a name="input_cloud_parameters"></a> [cloud\_parameters](#input\_cloud\_parameters) | cloud.conf options. Defaults inherited from [Slurm GCP repo](https://github.com/GoogleCloudPlatform/slurm-gcp/blob/master/terraform/slurm_cluster/modules/slurm_files/README_TF.md#input_cloud_parameters) | <pre>object({<br> no_comma_params = optional(bool)<br> resume_rate = optional(number)<br> resume_timeout = optional(number)<br> suspend_rate = optional(number)<br> suspend_timeout = optional(number)<br> topology_plugin = optional(string)<br> tree_width = optional(number, 128)<br> })</pre> | `{}` | no |
| <a name="input_cloud_parameters"></a> [cloud\_parameters](#input\_cloud\_parameters) | cloud.conf options. Defaults inherited from [Slurm GCP repo](https://github.com/GoogleCloudPlatform/slurm-gcp/blob/master/terraform/slurm_cluster/modules/slurm_files/README_TF.md#input_cloud_parameters) | <pre>object({<br> no_comma_params = optional(bool, false)<br> resume_rate = optional(number, 0)<br> resume_timeout = optional(number, 300)<br> suspend_rate = optional(number, 0)<br> suspend_timeout = optional(number, 300)<br> topology_plugin = optional(string, "topology/tree")<br> tree_width = optional(number, 128)<br> })</pre> | `{}` | no |
| <a name="input_cloudsql"></a> [cloudsql](#input\_cloudsql) | Use this database instead of the one on the controller.<br> server\_ip : Address of the database server.<br> user : The user to access the database as.<br> password : The password, given the user, to access the given database. (sensitive)<br> db\_name : The database to access. | <pre>object({<br> server_ip = string<br> user = string<br> password = string # sensitive<br> db_name = string<br> })</pre> | `null` | no |
| <a name="input_compute_startup_script"></a> [compute\_startup\_script](#input\_compute\_startup\_script) | Startup script used by the compute VMs. | `string` | `"# no-op"` | no |
| <a name="input_compute_startup_scripts_timeout"></a> [compute\_startup\_scripts\_timeout](#input\_compute\_startup\_scripts\_timeout) | The timeout (seconds) applied to each script in compute\_startup\_scripts. If<br>any script exceeds this timeout, then the instance setup process is considered<br>failed and handled accordingly.<br><br>NOTE: When set to 0, the timeout is considered infinite and thus disabled. | `number` | `300` | no |
Expand Down
12 changes: 6 additions & 6 deletions community/modules/scheduler/schedmd-slurm-gcp-v6-controller/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,12 +403,12 @@ EOD
variable "cloud_parameters" {
description = "cloud.conf options. Defaults inherited from [Slurm GCP repo](https://github.com/GoogleCloudPlatform/slurm-gcp/blob/master/terraform/slurm_cluster/modules/slurm_files/README_TF.md#input_cloud_parameters)"
type = object({
no_comma_params = optional(bool)
resume_rate = optional(number)
resume_timeout = optional(number)
suspend_rate = optional(number)
suspend_timeout = optional(number)
topology_plugin = optional(string)
no_comma_params = optional(bool, false)
resume_rate = optional(number, 0)
resume_timeout = optional(number, 300)
suspend_rate = optional(number, 0)
suspend_timeout = optional(number, 300)
topology_plugin = optional(string, "topology/tree")
tree_width = optional(number, 128)
})
default = {}
Expand Down
2 changes: 1 addition & 1 deletion community/modules/scheduler/schedmd-slurm-gcp-v6-controller/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ terraform {

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

required_version = ">= 0.14.0"
Expand Down
2 changes: 1 addition & 1 deletion community/modules/scripts/windows-startup-script/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:windows-startup-script/v1.36.1"
}

required_version = ">= 0.14.0"
Expand Down
4 changes: 2 additions & 2 deletions modules/compute/vm-instance/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:vm-instance/v1.36.1"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:vm-instance/v1.36.0"
module_name = "blueprints/terraform/hpc-toolkit:vm-instance/v1.36.1"
}

required_version = ">= 1.3.0"
Expand Down
4 changes: 2 additions & 2 deletions modules/file-system/filestore/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:filestore/v1.36.1"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:filestore/v1.36.0"
module_name = "blueprints/terraform/hpc-toolkit:filestore/v1.36.1"
}

required_version = ">= 0.14.0"
Expand Down
2 changes: 1 addition & 1 deletion modules/monitoring/dashboard/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:dashboard/v1.36.1"
}

required_version = ">= 0.14.0"
Expand Down
2 changes: 1 addition & 1 deletion modules/network/firewall-rules/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:firewall-rules/v1.36.1"
}

required_version = ">= 1.3"
Expand Down
2 changes: 1 addition & 1 deletion modules/network/pre-existing-subnetwork/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:pre-existing-subnetwork/v1.36.1"
}

required_version = ">= 0.14.0"
Expand Down
2 changes: 1 addition & 1 deletion modules/network/pre-existing-vpc/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:pre-existing-vpc/v1.36.1"
}

required_version = ">= 0.14.0"
Expand Down
2 changes: 1 addition & 1 deletion modules/scheduler/batch-login-node/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:batch-login-node/v1.36.1"
}

required_version = ">= 0.14.0"
Expand Down
2 changes: 1 addition & 1 deletion modules/scripts/startup-script/versions.tf
View file
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.36.0"
module_name = "blueprints/terraform/hpc-toolkit:startup-script/v1.36.1"
}

required_version = ">= 0.14.0"
Expand Down

0 comments on commit 493308e

Please sign in to comment.