Skip to content

Commit

Permalink
Merge pull request #2903 from mr0re1/hotfix_cc_version_bump
Browse files Browse the repository at this point in the history
Hotfix cc version bump
  • Loading branch information
mr0re1 authored Aug 9, 2024
2 parents 9e68ecc + 6686ea5 commit 229803f
Show file tree
Hide file tree
Showing 39 changed files with 49 additions and 53 deletions.
2 changes: 1 addition & 1 deletion cmd/root.go
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.37.0",
Version: "v1.37.2",
Annotations: annotation,
}
)
Expand Down
2 changes: 1 addition & 1 deletion community/modules/compute/gke-node-pool/versions.tf
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.37.0"
module_name = "blueprints/terraform/hpc-toolkit:gke-node-pool/v1.37.2"
}
}
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.37.0"
module_name = "blueprints/terraform/hpc-toolkit:htcondor-execute-point/v1.37.2"
}
}
2 changes: 1 addition & 1 deletion community/modules/compute/mig/versions.tf
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.37.0"
module_name = "blueprints/terraform/hpc-toolkit:mig/v1.37.2"
}
}
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.37.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-node-group/v1.37.2"
}
required_version = ">= 1.1"
}
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.37.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-partition/v1.37.2"
}
required_version = ">= 0.13.0"
}
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.37.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-dynamic/v1.37.2"
}
}
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.37.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-tpu/v1.37.2"
}
}
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.37.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset/v1.37.2"
}
}
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.37.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-partition/v1.37.2"
}
}
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.37.0"
module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.37.2"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.37.0"
module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.37.2"
}

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

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

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

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

required_version = ">= 0.14.0"
Expand Down
4 changes: 2 additions & 2 deletions community/modules/pubsub/bigquery-sub/versions.tf
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.37.0"
module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.37.2"
}
provider_meta "google-beta" {
module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.37.0"
module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.37.2"
}
required_version = ">= 1.0"
}
2 changes: 1 addition & 1 deletion community/modules/pubsub/topic/versions.tf
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.37.0"
module_name = "blueprints/terraform/hpc-toolkit:topic/v1.37.2"
}
}
2 changes: 1 addition & 1 deletion community/modules/scheduler/gke-cluster/versions.tf
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.37.0"
module_name = "blueprints/terraform/hpc-toolkit:gke-cluster/v1.37.2"
}
}
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.37.0"
module_name = "blueprints/terraform/hpc-toolkit:htcondor-access-point/v1.37.2"
}

required_version = ">= 1.1"
Expand Down
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.37.0"
module_name = "blueprints/terraform/hpc-toolkit:htcondor-central-manager/v1.37.2"
}

required_version = ">= 1.1.0"
Expand Down
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.37.0"
module_name = "blueprints/terraform/hpc-toolkit:htcondor-pool-secrets/v1.37.2"
}

required_version = ">= 1.3.0"
Expand Down
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.37.0"
module_name = "blueprints/terraform/hpc-toolkit:pre-existing-gke-cluster/v1.37.2"
}

required_version = ">= 1.0.0"
Expand Down
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.37.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-controller/v1.37.2"
}
required_version = ">= 1.1"
}
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.37.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v5-login/v1.37.2"
}
required_version = ">= 1.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,9 @@ done

echo "Deleting resource policies"
policies_filter="name:${cluster_name}-*"
while true; do
policies=$(gcloud compute resource-policies list --project "${project}" --format="value(selfLink)" --filter="${policies_filter}" --limit=10 | paste -sd " " -)
if [[ -z "${policies}" ]]; then
break
fi
# The lack of quotes is intentional and causes each new space-separated "word" to
# be treated as independent arguments. See PR#2523
# shellcheck disable=SC2086
gcloud compute resource-policies delete --quiet ${policies}
gcloud compute resource-policies list --project "${project}" --format="value(selfLink)" --filter="${policies_filter}" | while read -r line; do
echo "Deleting resource policy: $line"
gcloud compute resource-policies delete --quiet "${line}" || {
echo "Failed to delete resource policy: $line"
}
done
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.37.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-controller/v1.37.2"
}
}
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.37.0"
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-login/v1.37.2"
}
}
2 changes: 1 addition & 1 deletion community/modules/scripts/wait-for-startup/versions.tf
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.37.0"
module_name = "blueprints/terraform/hpc-toolkit:wait-for-startup/v1.37.2"
}

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

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

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

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

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

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

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

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

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

required_version = ">= 0.14.0"
Expand Down

0 comments on commit 229803f

Please sign in to comment.