Merge v1.58.0 into develop

cmd/root.go

@@ -53,7 +53,7 @@ HPC deployments on the Google Cloud Platform.`,
 				logging.Fatal("cmd.Help function failed: %s", err)
 			}
 		},
-		Version:     "v1.57.0",
+		Version:     "v1.58.0",
 		Annotations: annotation,
 	}
 )

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.57.0"
+    module_name = "blueprints/terraform/hpc-toolkit:htcondor-execute-point/v1.58.0"
   }
 }

community/modules/compute/mig/versions.tf

@@ -22,6 +22,6 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:mig/v1.57.0"
+    module_name = "blueprints/terraform/hpc-toolkit:mig/v1.58.0"
   }
 }

community/modules/compute/schedmd-slurm-gcp-v6-nodeset-dynamic/versions.tf

@@ -24,6 +24,6 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-dynamic/v1.57.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-dynamic/v1.58.0"
   }
 }

community/modules/compute/schedmd-slurm-gcp-v6-nodeset-tpu/versions.tf

@@ -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.57.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-tpu/v1.58.0"
   }
 }

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.57.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset/v1.58.0"
   }
 }

community/modules/compute/schedmd-slurm-gcp-v6-partition/versions.tf

@@ -18,6 +18,6 @@ terraform {
   required_version = ">= 1.3"
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-partition/v1.57.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-partition/v1.58.0"
   }
 }

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.57.0"
+    module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.58.0"
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.57.0"
+    module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.58.0"
   }
 
   required_version = ">= 0.13.0"

community/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.57.0"
+    module_name = "blueprints/terraform/hpc-toolkit:cloud-storage-bucket/v1.58.0"
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/hpc-toolkit:cloud-storage-bucket/v1.57.0"
+    module_name = "blueprints/terraform/hpc-toolkit:cloud-storage-bucket/v1.58.0"
   }
   required_version = ">= 0.14.0"
 }

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.57.0"
+    module_name = "blueprints/terraform/hpc-toolkit:nfs-server/v1.58.0"
   }
 
   required_version = ">= 0.14.0"

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.57.0"
+    module_name = "blueprints/terraform/hpc-toolkit:fsi-montecarlo-on-batch/v1.58.0"
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/hpc-toolkit:fsi-montecarlo-on-batch/v1.57.0"
+    module_name = "blueprints/terraform/hpc-toolkit:fsi-montecarlo-on-batch/v1.58.0"
   }
 }

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-controller/v1.57.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-controller/v1.58.0"
   }
 }

community/modules/network/private-service-access/versions.tf

@@ -30,11 +30,11 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:private-service-access/v1.57.0"
+    module_name = "blueprints/terraform/hpc-toolkit:private-service-access/v1.58.0"
   }
 
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/hpc-toolkit:private-service-access/v1.57.0"
+    module_name = "blueprints/terraform/hpc-toolkit:private-service-access/v1.58.0"
   }
 
   required_version = ">= 1.2"

community/modules/project/service-enablement/versions.tf

@@ -22,7 +22,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:service-enablement/v1.57.0"
+    module_name = "blueprints/terraform/hpc-toolkit:service-enablement/v1.58.0"
   }
 
   required_version = ">= 0.14.0"

community/modules/pubsub/bigquery-sub/versions.tf

@@ -26,10 +26,10 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.57.0"
+    module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.58.0"
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.57.0"
+    module_name = "blueprints/terraform/hpc-toolkit:bigquery-sub/v1.58.0"
   }
   required_version = ">= 1.0"
 }

community/modules/pubsub/topic/versions.tf

@@ -27,6 +27,6 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:topic/v1.57.0"
+    module_name = "blueprints/terraform/hpc-toolkit:topic/v1.58.0"
   }
 }

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.57.0"
+    module_name = "blueprints/terraform/hpc-toolkit:htcondor-access-point/v1.58.0"
   }
 
   required_version = ">= 1.1"

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.57.0"
+    module_name = "blueprints/terraform/hpc-toolkit:htcondor-central-manager/v1.58.0"
   }
 
   required_version = ">= 1.1.0"

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.57.0"
+    module_name = "blueprints/terraform/hpc-toolkit:htcondor-pool-secrets/v1.58.0"
   }
 
   required_version = ">= 1.3.0"

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.57.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-controller/v1.58.0"
   }
 }

community/modules/scheduler/schedmd-slurm-gcp-v6-login/versions.tf

@@ -24,6 +24,6 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-login/v1.57.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-login/v1.58.0"
   }
 }

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.57.0"
+    module_name = "blueprints/terraform/hpc-toolkit:wait-for-startup/v1.58.0"
   }
 
   required_version = ">= 0.14.0"

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

examples/README.md

@@ -59,6 +59,7 @@ md_toc github examples/README.md | sed -e "s/\s-\s/ * /"
   * [tutorial-fluent.yaml](#tutorial-fluentyaml--) ![community-badge] ![experimental-badge]
   * [gke-tpu-v6](#gke-tpu-v6--) ![community-badge] ![experimental-badge]
   * [xpk-n2-filestore](#xpk-n2-filestore--) ![community-badge] ![experimental-badge]
+  * [gke-h4d](#gke-h4d-) ![core-badge]
 * [Blueprint Schema](#blueprint-schema)
 * [Writing an HPC Blueprint](#writing-an-hpc-blueprint)
   * [Blueprint Boilerplate](#blueprint-boilerplate)
@@ -1453,6 +1454,12 @@ python3 xpk.py info --cluster xpk-01
 
 [xpk-n2-filestore]: ../community/examples/xpk-n2-filestore/xpk-n2-filestore.yaml
 
+### [gke-h4d] ![core-badge]
+
+This blueprint uses GKE to provision a Kubernetes cluster and a H4D node pool, along with networks and service accounts. Information about H4D machines can be found [here](https://cloud.google.com/blog/products/compute/new-h4d-vms-optimized-for-hpc). The deployment instructions can be found in the [README](/examples/gke-h4d/README.md).
+
+[gke-h4d]: ../examples/gke-h4d
+
 ## Blueprint Schema
 
 Similar documentation can be found on

examples/gke-h4d/README.md

@@ -0,0 +1,61 @@
+# GKE H4D Blueprint
+
+This blueprint uses GKE to provision a Kubernetes cluster and a H4D node pool, along with networks and service accounts. Information about H4D machines can be found [here](https://cloud.google.com/blog/products/compute/new-h4d-vms-optimized-for-hpc).
+
+> **_NOTE:_** The required GKE version for H4D support is >= 1.32.3-gke.1170000.
+
+## Steps to deploy the H4D blueprint
+
+1. Install Cluster Toolkit
+    1. Install [dependencies](https://cloud.google.com/cluster-toolkit/docs/setup/install-dependencies).
+    1. Set up [Cluster Toolkit](https://cloud.google.com/cluster-toolkit/docs/setup/configure-environment).
+1. Switch to the Cluster Toolkit directory
+
+   ```sh
+   cd cluster-toolkit
+   ```
+
+1. Get the IP address for your host machine
+
+   ```sh
+   curl ifconfig.me
+   ```
+
+1. Update the vars block of the `gke-h4d-deployment.yaml` file.
+    1. `project_id`: ID of the project where you are deploying the cluster.
+    1. `deployment_name`: Name of the deployment.
+    1. `region`: Compute region used for the deployment.
+    1. `zone`: Compute zone used for the deployment.
+    1. `static_node_count`: Number of nodes to create.
+    1. `authorized_cidr`: update the IP address in `<your-ip-address>/32`.
+1. Build the Cluster Toolkit binary
+
+   ```sh
+   make
+   ```
+
+1. Provision the GKE cluster
+
+   ```sh
+   ./gcluster deploy -d examples/gke-h4d/gke-h4d-deployment.yaml examples/gke-h4d/gke-h4d.yaml
+   ```
+
+   These four options are displayed:
+
+   ```sh
+   (D)isplay full proposed changes,
+   (A)pply proposed changes,
+   (S)top and exit,
+   (C)ontinue without applying
+   ```
+
+   Type `a` and hit enter to create the cluster.
+
+## Clean Up
+To destroy all resources associated with creating the GKE cluster, run the following command:
+
+```sh
+./gcluster destroy CLUSTER-NAME
+```
+
+Replace `CLUSTER-NAME` with the `deployment_name` used in the blueprint vars block.

examples/gke-h4d/gke-h4d-deployment.yaml

@@ -0,0 +1,40 @@
+# Copyright 2025 "Google LLC"
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+terraform_backend_defaults:
+  type: gcs
+  configuration:
+    # The GCS bucket used for storing terraform state
+    bucket: BUCKET_NAME
+
+vars:
+  # Your GCP Project ID
+  project_id: PROJECT_ID
+
+  # This should be unique across all of your Cluster
+  # Toolkit Deployments.
+  deployment_name: DEPLOYMENT_NAME
+
+  # The GCP Region used for this deployment.
+  region: COMPUTE_REGION
+
+  # The GCP Zone used for this deployment.
+  zone: COMPUTE_ZONE
+
+  # The number of nodes to be created
+  static_node_count: NODE_COUNT
+
+  # Cidr block containing the IP of the machine calling terraform.
+  # The following line must be updated for this example to work.
+  authorized_cidr: IP_ADDRESS/SUFFIX