Skip to content

Commit

Permalink
Add maintenance_interval to the testing code as null
Browse files Browse the repository at this point in the history 
Also changed controller_instance module as tflint was complaining about
null value passed to a string, and added Changelog for the release.
  • Loading branch information
@jvilarru
jvilarru committed Jan 9, 2024
1 parent 3391bd5 commit 71219bc
Show file tree
Hide file tree
Showing 8 changed files with 58 additions and 37 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

All notable changes to this project will be documented in this file.

## \[5.10.1\]

- Add maintenance_interval

## \[5.10.0\]

- Upgrade slurm to 23.02.7
Expand Down
20 changes: 11 additions & 9 deletions terraform/slurm_cluster/examples/slurm_cluster/cloud/basic/example.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,10 +339,11 @@ partitions = [
# network_tier = null
# },
]
additional_networks = []
bandwidth_tier = "platform_default"
enable_spot_vm = false
reservation_name = null
additional_networks = []
bandwidth_tier = "platform_default"
enable_spot_vm = false
reservation_name = null
maintenance_interval = null
spot_instance_config = {
termination_action = "STOP"
}
Expand Down Expand Up @@ -413,11 +414,12 @@ partitions = [
instance_template = null

# Instance Definition
access_config = []
additional_networks = []
bandwidth_tier = "platform_default"
enable_spot_vm = false
reservation_name = null
access_config = []
additional_networks = []
bandwidth_tier = "platform_default"
enable_spot_vm = false
reservation_name = null
maintenance_interval = null
spot_instance_config = {
termination_action = "STOP"
}
Expand Down
20 changes: 11 additions & 9 deletions terraform/slurm_cluster/examples/slurm_cluster/cloud/full/example.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,10 +330,11 @@ partitions = [
# network_tier = null
# },
]
additional_networks = []
bandwidth_tier = "platform_default"
enable_spot_vm = false
reservation_name = null
additional_networks = []
bandwidth_tier = "platform_default"
enable_spot_vm = false
reservation_name = null
maintenance_interval = null
spot_instance_config = {
termination_action = "STOP"
}
Expand Down Expand Up @@ -396,11 +397,12 @@ partitions = [
instance_template = null

# Instance Definition
access_config = []
additional_networks = []
bandwidth_tier = "platform_default"
enable_spot_vm = false
reservation_name = null
access_config = []
additional_networks = []
bandwidth_tier = "platform_default"
enable_spot_vm = false
reservation_name = null
maintenance_interval = null
spot_instance_config = {
termination_action = "STOP"
}
Expand Down
18 changes: 10 additions & 8 deletions terraform/slurm_cluster/examples/slurm_cluster/hybrid/basic/example.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,11 @@ partitions = [
# network_tier = null
# },
]
additional_networks = []
bandwidth_tier = "platform_default"
enable_spot_vm = false
reservation_name = null
additional_networks = []
bandwidth_tier = "platform_default"
enable_spot_vm = false
reservation_name = null
maintenance_interval = null
spot_instance_config = {
termination_action = "STOP"
}
Expand Down Expand Up @@ -262,10 +263,11 @@ partitions = [
instance_template = null

# Instance Definition
access_config = []
bandwidth_tier = "platform_default"
enable_spot_vm = false
reservation_name = null
access_config = []
bandwidth_tier = "platform_default"
enable_spot_vm = false
reservation_name = null
maintenance_interval = null
spot_instance_config = {
termination_action = "STOP"
}
Expand Down
20 changes: 11 additions & 9 deletions terraform/slurm_cluster/examples/slurm_cluster/hybrid/full/example.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,11 @@ partitions = [
# network_tier = null
# },
]
additional_networks = []
bandwidth_tier = "platform_default"
enable_spot_vm = false
reservation_name = null
additional_networks = []
bandwidth_tier = "platform_default"
enable_spot_vm = false
reservation_name = null
maintenance_interval = null
spot_instance_config = {
termination_action = "STOP"
}
Expand Down Expand Up @@ -256,11 +257,12 @@ partitions = [
instance_template = null

# Instance Definition
access_config = []
additional_networks = []
bandwidth_tier = "platform_default"
enable_spot_vm = false
reservation_name = null
access_config = []
additional_networks = []
bandwidth_tier = "platform_default"
enable_spot_vm = false
reservation_name = null
maintenance_interval = null
spot_instance_config = {
termination_action = "STOP"
}
Expand Down
4 changes: 2 additions & 2 deletions terraform/slurm_cluster/modules/slurm_controller_instance/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

locals {
region = (
length(regexall("/regions/([^/]*)", var.subnetwork)) > 0
? flatten(regexall("/regions/([^/]*)", var.subnetwork))[0]
length(regexall("/regions/([^/]*)", var.subnetwork != null ? var.subnetwork : "")) > 0
? flatten(regexall("/regions/([^/]*)", var.subnetwork != null ? var.subnetwork : ""))[0]
: var.region
)

Expand Down
3 changes: 3 additions & 0 deletions test/arm64-basic.tfvars.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ partitions = [
bandwidth_tier = "platform_default"
enable_spot_vm = false
reservation_name = null
maintenance_interval = null
spot_instance_config = {
termination_action = "STOP"
}
Expand Down Expand Up @@ -262,6 +263,7 @@ partitions = [
bandwidth_tier = "platform_default"
enable_spot_vm = true
reservation_name = null
maintenance_interval = null
spot_instance_config = {
termination_action = "STOP"
}
Expand Down Expand Up @@ -338,6 +340,7 @@ partitions = [
bandwidth_tier = "platform_default"
enable_spot_vm = false
reservation_name = null
maintenance_interval = null
spot_instance_config = {
termination_action = "STOP"
}
Expand Down
6 changes: 6 additions & 0 deletions test/x86_64-basic.tfvars.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ partitions = [
bandwidth_tier = "platform_default"
enable_spot_vm = false
reservation_name = null
maintenance_interval = null
spot_instance_config = {
termination_action = "STOP"
}
Expand Down Expand Up @@ -247,6 +248,7 @@ partitions = [
bandwidth_tier = "platform_default"
enable_spot_vm = false
reservation_name = null
maintenance_interval = null
spot_instance_config = {
termination_action = "STOP"
}
Expand Down Expand Up @@ -336,6 +338,7 @@ partitions = [
bandwidth_tier = "platform_default"
enable_spot_vm = false
reservation_name = null
maintenance_interval = null
spot_instance_config = {
termination_action = "STOP"
}
Expand Down Expand Up @@ -425,6 +428,7 @@ partitions = [
bandwidth_tier = "platform_default"
enable_spot_vm = true
reservation_name = null
maintenance_interval = null
spot_instance_config = {
termination_action = "STOP"
}
Expand Down Expand Up @@ -504,6 +508,7 @@ partitions = [
bandwidth_tier = "platform_default"
enable_spot_vm = false
reservation_name = null
maintenance_interval = null
spot_instance_config = {
termination_action = "STOP"
}
Expand Down Expand Up @@ -580,6 +585,7 @@ partitions = [
bandwidth_tier = "platform_default"
enable_spot_vm = false
reservation_name = null
maintenance_interval = null
spot_instance_config = {
termination_action = "STOP"
}
Expand Down

0 comments on commit 71219bc

Please sign in to comment.