Skip to content

Commit 846c7ad

Browse files
abbas1902abbas1902
authored
Merge pull request #4460 from abbas1902/checkless
Remove check_image validation assertions
2 parents 61aec72 + 1d8bace commit 846c7ad

28 files changed

Lines changed: 6 additions & 262 deletions

File tree

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ vars:
2828
built_instance_image:
2929
family: $(vars.built_image_family)
3030
project: $(vars.project_id)
31-
instance_image_custom: true
3231

3332
deployment_groups:
3433
- group: setup

‎community/examples/hpc-slurm-ubuntu2004.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ vars:
2626
# https://github.com/GoogleCloudPlatform/slurm-gcp/blob/master/docs/images.md#supported-operating-systems
2727
family: slurm-gcp-6-10-ubuntu-2204-lts-nvidia-570
2828
project: schedmd-slurm-public
29-
instance_image_custom: true
3029

3130
deployment_groups:
3231
- group: primary

‎community/examples/hpc-slurm6-apptainer.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ deployment_groups:
7676
node_count_dynamic_max: 20
7777
disk_size_gb: $(vars.disk_size)
7878
instance_image: $(vars.custom_image)
79-
instance_image_custom: true
8079
bandwidth_tier: gvnic_enabled
8180
allow_automatic_updates: false
8281

@@ -95,7 +94,6 @@ deployment_groups:
9594
enable_login_public_ips: true
9695
disk_size_gb: $(vars.disk_size)
9796
instance_image: $(vars.custom_image)
98-
instance_image_custom: true
9997

10098
- id: slurm_controller
10199
source: community/modules/scheduler/schedmd-slurm-gcp-v6-controller
@@ -107,4 +105,3 @@ deployment_groups:
107105
enable_controller_public_ips: true
108106
disk_size_gb: $(vars.disk_size)
109107
instance_image: $(vars.custom_image)
110-
instance_image_custom: true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ vars:
77
zone: {{ cluster.cloud_zone }}
88
enable_cleanup_compute: True
99
enable_bigquery_load: {{ cluster.use_bigquery }}
10-
instance_image_custom: True
10+
1111
labels:
1212
created_by: {{ site_name }}
1313

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ modules. For support with the underlying modules, see the instructions in the
6262
| Name | Version |
6363
|------|---------|
6464
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
65-
| <a name="requirement_google"></a> [google](#requirement\_google) | >= 5.11 |
6665
6766
## Providers
6867

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

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,6 @@
1515
*/
1616

1717
locals {
18-
# Currently supported images and projects
19-
known_project_families = {
20-
schedmd-slurm-public = [
21-
"slurm-gcp-6-10-debian-12",
22-
"slurm-gcp-6-10-hpc-rocky-linux-8",
23-
"slurm-gcp-6-10-ubuntu-2204-lts-nvidia-570",
24-
"slurm-gcp-6-10-ubuntu-2404-lts-nvidia-570",
25-
"slurm-gcp-6-10-ubuntu-2204-lts-arm64",
26-
"slurm-gcp-6-10-ubuntu-2404-lts-arm64"
27-
]
28-
}
29-
3018
# This approach to "hacking" the project name allows a chain of Terraform
3119
# calls to set the instance source_image (boot disk) with a "relative
3220
# resource name" that passes muster with VPC Service Control rules
@@ -40,43 +28,3 @@ locals {
4028
source_image_family = try(var.instance_image.family, "")
4129
source_image = try(var.instance_image.name, "")
4230
}
43-
44-
check "image_validation" {
45-
data "google_compute_image" "slurm" {
46-
family = try(var.instance_image.family, null)
47-
name = try(var.instance_image.name, null)
48-
project = var.instance_image.project
49-
}
50-
51-
assert {
52-
condition = length(regexall("^projects/.+?/global/images/family$", var.instance_image.project)) == 0
53-
error_message = "The \"project\" field in var.instance_image no longer supports a long-form ending in \"family\". Specify only the project ID."
54-
}
55-
56-
assert {
57-
condition = var.instance_image_custom || contains(keys(local.known_project_families), data.google_compute_image.slurm.project)
58-
error_message = <<-EOD
59-
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.
60-
EOD
61-
}
62-
63-
assert {
64-
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)
65-
error_message = <<-EOD
66-
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:
67-
${join("\n", [for p in try(local.known_project_families[data.google_compute_image.slurm.project], []) : "\t\"${p}\""])}
68-
EOD
69-
}
70-
71-
assert {
72-
condition = var.disk_size_gb >= data.google_compute_image.slurm.disk_size_gb
73-
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"
74-
}
75-
76-
assert {
77-
# Condition needs to check the suffix of the license, as prefix contains an API version which can change.
78-
# Example license value: https://www.googleapis.com/compute/v1/projects/cloud-hpc-image-public/global/licenses/hpc-vm-image-feature-disable-auto-updates
79-
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")])
80-
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"
81-
}
82-
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ variable "instance_image" {
8383
}
8484
}
8585

86-
variable "instance_image_custom" {
86+
variable "instance_image_custom" { # tflint-ignore: terraform_unused_declarations
8787
description = <<-EOD
8888
A flag that designates that the user is aware that they are requesting
8989
to use a custom and potentially incompatible image for this Slurm on

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@
1616

1717
terraform {
1818
required_version = ">= 1.3"
19-
20-
required_providers {
21-
google = {
22-
source = "hashicorp/google"
23-
version = ">= 5.11"
24-
}
25-
}
2619
provider_meta "google" {
2720
module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-dynamic/v1.59.1"
2821
}

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

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,6 @@
1515
*/
1616

1717
locals {
18-
# Currently supported images and projects
19-
known_project_families = {
20-
schedmd-slurm-public = [
21-
"slurm-gcp-6-10-debian-12",
22-
"slurm-gcp-6-10-hpc-rocky-linux-8",
23-
"slurm-gcp-6-10-ubuntu-2204-lts-nvidia-570",
24-
"slurm-gcp-6-10-ubuntu-2404-lts-nvidia-570",
25-
"slurm-gcp-6-10-ubuntu-2204-lts-arm64",
26-
"slurm-gcp-6-10-ubuntu-2404-lts-arm64"
27-
]
28-
}
29-
3018
# This approach to "hacking" the project name allows a chain of Terraform
3119
# calls to set the instance source_image (boot disk) with a "relative
3220
# resource name" that passes muster with VPC Service Control rules
@@ -40,43 +28,3 @@ locals {
4028
source_image_family = try(var.instance_image.family, "")
4129
source_image = try(var.instance_image.name, "")
4230
}
43-
44-
check "image_validation" {
45-
data "google_compute_image" "slurm" {
46-
family = try(var.instance_image.family, null)
47-
name = try(var.instance_image.name, null)
48-
project = var.instance_image.project
49-
}
50-
51-
assert {
52-
condition = length(regexall("^projects/.+?/global/images/family$", var.instance_image.project)) == 0
53-
error_message = "The \"project\" field in var.instance_image no longer supports a long-form ending in \"family\". Specify only the project ID."
54-
}
55-
56-
assert {
57-
condition = var.instance_image_custom || contains(keys(local.known_project_families), data.google_compute_image.slurm.project)
58-
error_message = <<-EOD
59-
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.
60-
EOD
61-
}
62-
63-
assert {
64-
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)
65-
error_message = <<-EOD
66-
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:
67-
${join("\n", [for p in try(local.known_project_families[data.google_compute_image.slurm.project], []) : "\t\"${p}\""])}
68-
EOD
69-
}
70-
71-
assert {
72-
condition = var.disk_size_gb >= data.google_compute_image.slurm.disk_size_gb
73-
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"
74-
}
75-
76-
assert {
77-
# Condition needs to check the suffix of the license, as prefix contains an API version which can change.
78-
# Example license value: https://www.googleapis.com/compute/v1/projects/cloud-hpc-image-public/global/licenses/hpc-vm-image-feature-disable-auto-updates
79-
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")])
80-
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"
81-
}
82-
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ variable "instance_image" {
103103
}
104104
}
105105

106-
variable "instance_image_custom" {
106+
variable "instance_image_custom" { # tflint-ignore: terraform_unused_declarations
107107
description = <<-EOD
108108
A flag that designates that the user is aware that they are requesting
109109
to use a custom and potentially incompatible image for this Slurm on

0 commit comments

Comments
 (0)