Skip to content

Commit 71219bc

Browse files
jvilarrujvilarru
committed
Add maintenance_interval to the testing code as null
Also changed controller_instance module as tflint was complaining about null value passed to a string, and added Changelog for the release.
1 parent 3391bd5 commit 71219bc

File tree

8 files changed

+58
-37
lines changed

8 files changed

+58
-37
lines changed

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

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

5+
## \[5.10.1\]
6+
7+
- Add maintenance_interval
8+
59
## \[5.10.0\]
610

711
- Upgrade slurm to 23.02.7

‎terraform/slurm_cluster/examples/slurm_cluster/cloud/basic/example.tfvars

+11-9
Original file line numberDiff line numberDiff line change
@@ -339,10 +339,11 @@ partitions = [
339339
# network_tier = null
340340
# },
341341
]
342-
additional_networks = []
343-
bandwidth_tier = "platform_default"
344-
enable_spot_vm = false
345-
reservation_name = null
342+
additional_networks = []
343+
bandwidth_tier = "platform_default"
344+
enable_spot_vm = false
345+
reservation_name = null
346+
maintenance_interval = null
346347
spot_instance_config = {
347348
termination_action = "STOP"
348349
}
@@ -413,11 +414,12 @@ partitions = [
413414
instance_template = null
414415

415416
# Instance Definition
416-
access_config = []
417-
additional_networks = []
418-
bandwidth_tier = "platform_default"
419-
enable_spot_vm = false
420-
reservation_name = null
417+
access_config = []
418+
additional_networks = []
419+
bandwidth_tier = "platform_default"
420+
enable_spot_vm = false
421+
reservation_name = null
422+
maintenance_interval = null
421423
spot_instance_config = {
422424
termination_action = "STOP"
423425
}

‎terraform/slurm_cluster/examples/slurm_cluster/cloud/full/example.tfvars

+11-9
Original file line numberDiff line numberDiff line change
@@ -330,10 +330,11 @@ partitions = [
330330
# network_tier = null
331331
# },
332332
]
333-
additional_networks = []
334-
bandwidth_tier = "platform_default"
335-
enable_spot_vm = false
336-
reservation_name = null
333+
additional_networks = []
334+
bandwidth_tier = "platform_default"
335+
enable_spot_vm = false
336+
reservation_name = null
337+
maintenance_interval = null
337338
spot_instance_config = {
338339
termination_action = "STOP"
339340
}
@@ -396,11 +397,12 @@ partitions = [
396397
instance_template = null
397398

398399
# Instance Definition
399-
access_config = []
400-
additional_networks = []
401-
bandwidth_tier = "platform_default"
402-
enable_spot_vm = false
403-
reservation_name = null
400+
access_config = []
401+
additional_networks = []
402+
bandwidth_tier = "platform_default"
403+
enable_spot_vm = false
404+
reservation_name = null
405+
maintenance_interval = null
404406
spot_instance_config = {
405407
termination_action = "STOP"
406408
}

‎terraform/slurm_cluster/examples/slurm_cluster/hybrid/basic/example.tfvars

+10-8
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,11 @@ partitions = [
188188
# network_tier = null
189189
# },
190190
]
191-
additional_networks = []
192-
bandwidth_tier = "platform_default"
193-
enable_spot_vm = false
194-
reservation_name = null
191+
additional_networks = []
192+
bandwidth_tier = "platform_default"
193+
enable_spot_vm = false
194+
reservation_name = null
195+
maintenance_interval = null
195196
spot_instance_config = {
196197
termination_action = "STOP"
197198
}
@@ -262,10 +263,11 @@ partitions = [
262263
instance_template = null
263264

264265
# Instance Definition
265-
access_config = []
266-
bandwidth_tier = "platform_default"
267-
enable_spot_vm = false
268-
reservation_name = null
266+
access_config = []
267+
bandwidth_tier = "platform_default"
268+
enable_spot_vm = false
269+
reservation_name = null
270+
maintenance_interval = null
269271
spot_instance_config = {
270272
termination_action = "STOP"
271273
}

‎terraform/slurm_cluster/examples/slurm_cluster/hybrid/full/example.tfvars

+11-9
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,11 @@ partitions = [
190190
# network_tier = null
191191
# },
192192
]
193-
additional_networks = []
194-
bandwidth_tier = "platform_default"
195-
enable_spot_vm = false
196-
reservation_name = null
193+
additional_networks = []
194+
bandwidth_tier = "platform_default"
195+
enable_spot_vm = false
196+
reservation_name = null
197+
maintenance_interval = null
197198
spot_instance_config = {
198199
termination_action = "STOP"
199200
}
@@ -256,11 +257,12 @@ partitions = [
256257
instance_template = null
257258

258259
# Instance Definition
259-
access_config = []
260-
additional_networks = []
261-
bandwidth_tier = "platform_default"
262-
enable_spot_vm = false
263-
reservation_name = null
260+
access_config = []
261+
additional_networks = []
262+
bandwidth_tier = "platform_default"
263+
enable_spot_vm = false
264+
reservation_name = null
265+
maintenance_interval = null
264266
spot_instance_config = {
265267
termination_action = "STOP"
266268
}

‎terraform/slurm_cluster/modules/slurm_controller_instance/main.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
locals {
2222
region = (
23-
length(regexall("/regions/([^/]*)", var.subnetwork)) > 0
24-
? flatten(regexall("/regions/([^/]*)", var.subnetwork))[0]
23+
length(regexall("/regions/([^/]*)", var.subnetwork != null ? var.subnetwork : "")) > 0
24+
? flatten(regexall("/regions/([^/]*)", var.subnetwork != null ? var.subnetwork : ""))[0]
2525
: var.region
2626
)
2727

‎test/arm64-basic.tfvars.tpl

+3
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ partitions = [
172172
bandwidth_tier = "platform_default"
173173
enable_spot_vm = false
174174
reservation_name = null
175+
maintenance_interval = null
175176
spot_instance_config = {
176177
termination_action = "STOP"
177178
}
@@ -262,6 +263,7 @@ partitions = [
262263
bandwidth_tier = "platform_default"
263264
enable_spot_vm = true
264265
reservation_name = null
266+
maintenance_interval = null
265267
spot_instance_config = {
266268
termination_action = "STOP"
267269
}
@@ -338,6 +340,7 @@ partitions = [
338340
bandwidth_tier = "platform_default"
339341
enable_spot_vm = false
340342
reservation_name = null
343+
maintenance_interval = null
341344
spot_instance_config = {
342345
termination_action = "STOP"
343346
}

‎test/x86_64-basic.tfvars.tpl

+6
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ partitions = [
172172
bandwidth_tier = "platform_default"
173173
enable_spot_vm = false
174174
reservation_name = null
175+
maintenance_interval = null
175176
spot_instance_config = {
176177
termination_action = "STOP"
177178
}
@@ -247,6 +248,7 @@ partitions = [
247248
bandwidth_tier = "platform_default"
248249
enable_spot_vm = false
249250
reservation_name = null
251+
maintenance_interval = null
250252
spot_instance_config = {
251253
termination_action = "STOP"
252254
}
@@ -336,6 +338,7 @@ partitions = [
336338
bandwidth_tier = "platform_default"
337339
enable_spot_vm = false
338340
reservation_name = null
341+
maintenance_interval = null
339342
spot_instance_config = {
340343
termination_action = "STOP"
341344
}
@@ -425,6 +428,7 @@ partitions = [
425428
bandwidth_tier = "platform_default"
426429
enable_spot_vm = true
427430
reservation_name = null
431+
maintenance_interval = null
428432
spot_instance_config = {
429433
termination_action = "STOP"
430434
}
@@ -504,6 +508,7 @@ partitions = [
504508
bandwidth_tier = "platform_default"
505509
enable_spot_vm = false
506510
reservation_name = null
511+
maintenance_interval = null
507512
spot_instance_config = {
508513
termination_action = "STOP"
509514
}
@@ -580,6 +585,7 @@ partitions = [
580585
bandwidth_tier = "platform_default"
581586
enable_spot_vm = false
582587
reservation_name = null
588+
maintenance_interval = null
583589
spot_instance_config = {
584590
termination_action = "STOP"
585591
}

0 commit comments

Comments
 (0)