Merge pull request #4480 from GoogleCloudPlatform/release-candidate

Release candidate v1.61.0

Author: Shuang-cnt

cmd/root.go

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

community/examples/hpc-build-slurm-image.yaml

@@ -28,7 +28,6 @@ vars:
   built_instance_image:
     family: $(vars.built_image_family)
     project: $(vars.project_id)
-  instance_image_custom: true
 
 deployment_groups:
 - group: setup

community/examples/hpc-slurm-ubuntu2004.yaml

@@ -26,7 +26,6 @@ vars:
     # https://github.com/GoogleCloudPlatform/slurm-gcp/blob/master/docs/images.md#supported-operating-systems
     family: slurm-gcp-6-10-ubuntu-2204-lts-nvidia-570
     project: schedmd-slurm-public
-  instance_image_custom: true
 
 deployment_groups:
 - group: primary

community/examples/hpc-slurm6-apptainer.yaml

@@ -76,7 +76,6 @@ deployment_groups:
       node_count_dynamic_max: 20
       disk_size_gb: $(vars.disk_size)
       instance_image: $(vars.custom_image)
-      instance_image_custom: true
       bandwidth_tier: gvnic_enabled
       allow_automatic_updates: false
 
@@ -95,7 +94,6 @@ deployment_groups:
       enable_login_public_ips: true
       disk_size_gb: $(vars.disk_size)
       instance_image: $(vars.custom_image)
-      instance_image_custom: true
 
   - id: slurm_controller
     source: community/modules/scheduler/schedmd-slurm-gcp-v6-controller
@@ -107,4 +105,3 @@ deployment_groups:
       enable_controller_public_ips: true
       disk_size_gb: $(vars.disk_size)
       instance_image: $(vars.custom_image)
-      instance_image_custom: true

community/front-end/ofe/website/ghpcfe/templates/blueprint/cluster_config.yaml.j2

@@ -7,7 +7,7 @@ vars:
   zone: {{ cluster.cloud_zone }}
   enable_cleanup_compute: True
   enable_bigquery_load: {{ cluster.use_bigquery }}
-  instance_image_custom: True
+  
   labels:
     created_by: {{ site_name }}
 

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

community/modules/compute/mig/versions.tf

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

community/modules/compute/schedmd-slurm-gcp-v6-nodeset-dynamic/README.md

@@ -62,7 +62,6 @@ modules. For support with the underlying modules, see the instructions in the
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
-| <a name="requirement_google"></a> [google](#requirement\_google) | >= 5.11 |
 
 ## Providers
 

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

@@ -15,18 +15,6 @@
  */
 
 locals {
-  # Currently supported images and projects
-  known_project_families = {
-    schedmd-slurm-public = [
-      "slurm-gcp-6-10-debian-12",
-      "slurm-gcp-6-10-hpc-rocky-linux-8",
-      "slurm-gcp-6-10-ubuntu-2204-lts-nvidia-570",
-      "slurm-gcp-6-10-ubuntu-2404-lts-nvidia-570",
-      "slurm-gcp-6-10-ubuntu-2204-lts-arm64",
-      "slurm-gcp-6-10-ubuntu-2404-lts-arm64"
-    ]
-  }
-
   # This approach to "hacking" the project name allows a chain of Terraform
   # calls to set the instance source_image (boot disk) with a "relative
   # resource name" that passes muster with VPC Service Control rules
@@ -40,43 +28,3 @@ locals {
   source_image_family = try(var.instance_image.family, "")
   source_image        = try(var.instance_image.name, "")
 }
-
-check "image_validation" {
-  data "google_compute_image" "slurm" {
-    family  = try(var.instance_image.family, null)
-    name    = try(var.instance_image.name, null)
-    project = var.instance_image.project
-  }
-
-  assert {
-    condition     = length(regexall("^projects/.+?/global/images/family$", var.instance_image.project)) == 0
-    error_message = "The \"project\" field in var.instance_image no longer supports a long-form ending in \"family\". Specify only the project ID."
-  }
-
-  assert {
-    condition     = var.instance_image_custom || contains(keys(local.known_project_families), data.google_compute_image.slurm.project)
-    error_message = <<-EOD
-      Images in project ${data.google_compute_image.slurm.project} are not published by SchedMD. Images must be created by compatible releases of the Terraform and Packer modules following the guidance at https://goo.gle/hpc-slurm-images. Set var.instance_image_custom to true to silence this error and acknowledge that you are using a compatible image.
-      EOD
-  }
-
-  assert {
-    condition     = !contains(keys(local.known_project_families), data.google_compute_image.slurm.project) || try(contains(local.known_project_families[data.google_compute_image.slurm.project], data.google_compute_image.slurm.family), false)
-    error_message = <<-EOD
-      Image family ${data.google_compute_image.slurm.family} published by SchedMD in project ${data.google_compute_image.slurm.project} is not compatible with this release of the Terraform Slurm modules. Select from known compatible releases:
-      ${join("\n", [for p in try(local.known_project_families[data.google_compute_image.slurm.project], []) : "\t\"${p}\""])}
-      EOD
-  }
-
-  assert {
-    condition     = var.disk_size_gb >= data.google_compute_image.slurm.disk_size_gb
-    error_message = "'disk_size_gb: ${var.disk_size_gb}' is smaller than the image size (${data.google_compute_image.slurm.disk_size_gb}GB), please increase the blueprint disk size"
-  }
-
-  assert {
-    # Condition needs to check the suffix of the license, as prefix contains an API version which can change.
-    # Example license value: https://www.googleapis.com/compute/v1/projects/cloud-hpc-image-public/global/licenses/hpc-vm-image-feature-disable-auto-updates
-    condition     = var.allow_automatic_updates || anytrue([for license in data.google_compute_image.slurm.licenses : endswith(license, "/projects/cloud-hpc-image-public/global/licenses/hpc-vm-image-feature-disable-auto-updates")])
-    error_message = "Disabling automatic updates is not supported with the selected VM image.  More information: https://cloud.google.com/compute/docs/instances/create-hpc-vm#disable_automatic_updates"
-  }
-}

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

@@ -83,7 +83,7 @@ variable "instance_image" {
   }
 }
 
-variable "instance_image_custom" {
+variable "instance_image_custom" { # tflint-ignore: terraform_unused_declarations
   description = <<-EOD
     A flag that designates that the user is aware that they are requesting
     to use a custom and potentially incompatible image for this Slurm on