Merge pull request #3641 from GoogleCloudPlatform/release-candidate

Release v1.46.0

Author: abbas1902

.github/dependabot.yml

@@ -64,25 +64,3 @@ updates:
       update-types:
       - minor
       - patch
-- package-ecosystem: pip
-  directory: /community/modules/scheduler/schedmd-slurm-gcp-v6-controller/modules/slurm_files/scripts/
-  labels:
-  - dependencies
-  - python
-  - release-chore
-  schedule:
-    interval: monthly
-    day: monday
-    time: "03:00"
-    timezone: America/Los_Angeles
-  target-branch: develop
-  groups:
-    # group all Slurm minor/patch updates together and individual PRs for major updates
-    # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/optimizing-pr-creation-version-updates#example-3-individual-pull-requests-for-major-updates-and-grouped-for-minorpatch-updates
-    slurm-python-minor-and-patch-updates:
-      applies-to: version-updates
-      patterns:
-      - "*"
-      update-types:
-      - minor
-      - patch

.github/workflows/pr-precommit.yml

@@ -34,6 +34,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5
       with:
+        # internal Python tests require Python 3.10
         python-version: '3.10'
         check-latest: true
         cache: 'pip'
@@ -56,3 +57,33 @@ jobs:
     - uses: pre-commit/action@v3.0.1
       with:
         extra_args: --show-diff-on-failure --all-files
+  pre-commit-highest-dependencies:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
+      with:
+        # the slurm-files Python requirements.txt requires updating
+        # to enable 3.12+ compatibility
+        python-version: '3.11'
+        check-latest: true
+        cache: 'pip'
+    - uses: actions/setup-go@v5
+      with:
+        go-version: '1.23'
+        check-latest: true
+    - uses: hashicorp/setup-terraform@v3
+      with:
+        terraform_version: latest
+        terraform_wrapper: false
+    - run: make install-dev-deps
+    - uses: terraform-linters/setup-tflint@v4
+      with:
+        tflint_version: v0.49.0
+    - run: tflint --init
+      env:
+        # https://github.com/terraform-linters/tflint/blob/master/docs/user-guide/plugins.md#avoiding-rate-limiting
+        GITHUB_TOKEN: ${{ github.token }}
+    - uses: pre-commit/action@v3.0.1
+      with:
+        extra_args: --show-diff-on-failure --all-files

Makefile

@@ -1,7 +1,7 @@
 # PREAMBLE
 MIN_PACKER_VERSION=1.7.9 # for building images
-MIN_TERRAFORM_VERSION=1.2 # for deploying modules
-MIN_GOLANG_VERSION=1.18 # for building gcluster
+MIN_TERRAFORM_VERSION=1.5.7 # for deploying modules
+MIN_GOLANG_VERSION=1.22 # for building gcluster
 
 .PHONY: install install-user tests format install-dev-deps \
         warn-go-missing warn-terraform-missing warn-packer-missing \
@@ -14,6 +14,8 @@ SHELL=/bin/bash -o pipefail
 ENG = ./cmd/... ./pkg/...
 TERRAFORM_FOLDERS=$(shell find ./modules ./community/modules ./tools -type f -name "*.tf" -not -path '*/\.*' -exec dirname "{}" \; | sort -u)
 PACKER_FOLDERS=$(shell find ./modules ./community/modules ./tools -type f -name "*.pkr.hcl" -not -path '*/\.*' -exec dirname "{}" \; | sort -u)
+BINARY_TARGETS := ghpc gcluster
+INSTALL_DIRS := . ~/bin /usr/local/bin
 
 ifneq (, $(shell which git))
 ## GIT IS PRESENT
@@ -72,6 +74,23 @@ install-dev-deps: warn-terraform-version warn-packer-version check-pre-commit ch
 	pip install -r community/modules/scheduler/schedmd-slurm-gcp-v6-controller/modules/slurm_files/scripts/requirements.txt
 	pip install -r community/modules/scheduler/schedmd-slurm-gcp-v6-controller/modules/slurm_files/scripts/tests/requirements.txt
 
+
+clean:
+	@for dir in $(INSTALL_DIRS); do \
+		for file in $(BINARY_TARGETS); do \
+			if [ -f "$$dir/$$file" ] || [ -L "$$dir/$$file" ]; then \
+				if [ -w "$$dir/$$file" ]; then \
+					echo "Removing $$dir/$$file"; \
+					rm "$$dir/$$file"; \
+				else \
+					echo "Do not have permissions to delete $$dir/$$file"; \
+				fi; \
+			else \
+				echo "$$dir/$$file does not exist"; \
+			fi; \
+		done; \
+	done
+
 # RULES SUPPORTING THE ABOVE
 
 test-engine: warn-go-missing

cmd/root.go

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

community/examples/AMD/hpc-amd-slurm.yaml

@@ -178,7 +178,6 @@ deployment_groups:
       machine_type: c2d-standard-4
       node_count_dynamic_max: 10
       bandwidth_tier: gvnic_enabled
-      enable_placement: false
       allow_automatic_updates: false
 
   - id: low_cost_partition
@@ -194,7 +193,6 @@ deployment_groups:
       machine_type: c2d-standard-112
       node_count_dynamic_max: 50
       bandwidth_tier: gvnic_enabled
-      enable_placement: true
       allow_automatic_updates: false
 
   # Because is_default is set to true, jobs will run on this partition unless an

community/examples/hpc-slurm-gromacs.yaml

@@ -31,6 +31,12 @@ deployment_groups:
   - id: network
     source: modules/network/vpc
 
+  # Private Service Access (PSA) requires the compute.networkAdmin role which is
+  # included in the Owner role, but not Editor.
+  # PSA is a best practice for Filestore instances, but can be optionally
+  # removed by deleting the private_service_access module and any references to
+  # the module by Filestore modules.
+  # https://cloud.google.com/vpc/docs/configure-private-services-access#permissions
   - id: private_service_access
     source: community/modules/network/private-service-access
     use: [network]

community/examples/hpc-slurm-h4d.yaml

@@ -0,0 +1,141 @@
+# 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.
+---
+blueprint_name: slurm-h4d
+vars:
+  project_id: ## Set GCP Project ID Here ##
+  deployment_name: slurm-h4d
+  region: us-central1
+  zone: us-central1-a
+  rdma_net_range: 192.168.128.0/18
+
+# Documentation for each of the modules used below can be found at
+# https://github.com/GoogleCloudPlatform/hpc-toolkit/blob/main/modules/README.md
+deployment_groups:
+- group: primary
+  modules:
+
+  # Source is an embedded module, denoted by "modules/*" without ./, ../, /
+  # as a prefix. To refer to a local module, prefix with ./, ../ or /
+
+  - id: h4d-slurm-net-0
+    source: modules/network/vpc
+
+  - id: h4d-rdma-net
+    source: modules/network/vpc
+    settings:
+      network_name: $(vars.deployment_name)-rdma-net-0
+      mtu: 8896
+      network_profile: https://www.googleapis.com/compute/beta/projects/$(vars.project_id)/global/networkProfiles/$(vars.zone)-vpc-falcon
+      network_routing_mode: REGIONAL
+      enable_cloud_router: false
+      enable_cloud_nat: false
+      subnetworks:
+      - subnet_name: $(vars.deployment_name)-rdma-sub-0
+        subnet_region: $(vars.region)
+        subnet_ip: $(vars.rdma_net_range)
+        region: $(vars.region)
+      firewall_rules:
+      - name: $(vars.deployment_name)-rdma-0
+        ranges: [$(vars.rdma_net_range)]
+        allow:
+        - protocol: tcp
+        - protocol: udp
+        - protocol: icmp
+
+  - id: homefs
+    source: modules/file-system/filestore
+    use: [h4d-slurm-net-0]
+    settings:
+      filestore_tier: BASIC_SSD
+      size_gb: 2560
+      filestore_share_name: homeshare
+      local_mount: /home
+
+  - id: appsfs
+    source: modules/file-system/filestore
+    use: [h4d-slurm-net-0]
+    settings:
+      filestore_tier: BASIC_SSD
+      size_gb: 2560
+      filestore_share_name: appsshare
+      local_mount: /apps
+
+  - id: h4d_startup
+    source: modules/scripts/startup-script
+    settings:
+      install_cloud_rdma_drivers: true
+      set_ofi_cloud_rdma_tunables: true
+      local_ssd_filesystem:
+        fs_type: ext4
+        mountpoint: /mnt/lssd
+        permissions: "1777"
+
+  - id: h4d_nodeset
+    source: community/modules/compute/schedmd-slurm-gcp-v6-nodeset
+    use: [h4d_startup, h4d-slurm-net-0]
+    settings:
+      bandwidth_tier: gvnic_enabled
+      machine_type: h4d-highmem-192-lssd
+      node_count_static: 2
+      node_count_dynamic_max: 0
+      enable_placement: false
+      disk_type: hyperdisk-balanced
+      on_host_maintenance: TERMINATE
+      additional_networks:
+        $(concat(
+          [{
+            network=null,
+            subnetwork=h4d-rdma-net.subnetwork_self_link,
+            subnetwork_project=vars.project_id,
+            nic_type="IRDMA",
+            queue_count=null,
+            network_ip=null,
+            stack_type=null,
+            access_config=null,
+            ipv6_access_config=[],
+            alias_ip_range=[]
+          }]
+        ))
+
+  - id: h4d_partition
+    source: community/modules/compute/schedmd-slurm-gcp-v6-partition
+    use:
+    - h4d_nodeset
+    settings:
+      exclusive: false
+      partition_name: h4d
+      is_default: true
+      partition_conf:
+        ResumeTimeout: 900
+        SuspendTimeout: 600
+
+  - id: slurm_login
+    source: community/modules/scheduler/schedmd-slurm-gcp-v6-login
+    use: [h4d-slurm-net-0]
+    settings:
+      machine_type: n2-standard-4
+      enable_login_public_ips: true
+
+  - id: slurm_controller_startup
+    source: modules/scripts/startup-script
+    settings:
+      set_ofi_cloud_rdma_tunables: true
+
+  - id: slurm_controller
+    source: community/modules/scheduler/schedmd-slurm-gcp-v6-controller
+    use: [h4d-slurm-net-0, h4d_partition, slurm_login, homefs, appsfs]
+    settings:
+      enable_controller_public_ips: true
+      controller_startup_script: $(slurm_controller_startup.startup_script)

community/examples/hpc-slurm-local-ssd.yaml

@@ -31,6 +31,12 @@ deployment_groups:
   - id: network
     source: modules/network/vpc
 
+  # Private Service Access (PSA) requires the compute.networkAdmin role which is
+  # included in the Owner role, but not Editor.
+  # PSA is a best practice for Filestore instances, but can be optionally
+  # removed by deleting the private_service_access module and any references to
+  # the module by Filestore modules.
+  # https://cloud.google.com/vpc/docs/configure-private-services-access#permissions
   - id: private_service_access
     source: community/modules/network/private-service-access
     use: [network]

community/examples/hpc-slurm-sharedvpc.yaml

@@ -61,7 +61,6 @@ deployment_groups:
     settings:
       node_count_dynamic_max: 4
       machine_type: n2-standard-2
-      enable_placement: false  # the default is: true
       allow_automatic_updates: false
 
   - id: debug_partition

community/examples/hpc-slurm-ubuntu2004.yaml

@@ -36,6 +36,12 @@ deployment_groups:
   - id: network
     source: modules/network/vpc
 
+  # Private Service Access (PSA) requires the compute.networkAdmin role which is
+  # included in the Owner role, but not Editor.
+  # PSA is a best practice for Filestore instances, but can be optionally
+  # removed by deleting the private_service_access module and any references to
+  # the module by Filestore modules.
+  # https://cloud.google.com/vpc/docs/configure-private-services-access#permissions
   - id: private_service_access
     source: community/modules/network/private-service-access
     use: [network]
@@ -51,7 +57,6 @@ deployment_groups:
     use: [network]
     settings:
       instance_image: $(vars.slurm_image)
-      enable_placement: false # the default is: true
       node_count_dynamic_max: 4
       machine_type: n2-standard-2