Merge pull request #5 from aenix-io/fix-disk

Fix: always specify disk, even if system_disk not found
aenix-io · May 30, 2024 · c4aa52b · c4aa52b
2 parents 5651f91 + e799168
commit c4aa52b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/charts/talm/templates/_helpers.tpl b/charts/talm/templates/_helpers.tpl
@@ -1,9 +1,14 @@
 {{- define "talm.discovered.system_disk_name" }}
+{{- $disk := "" }}
 {{- range .Disks }}
+{{- if eq $disk "" }}
+{{- $disk = .device_name }}
+{{- end }}
 {{- if .system_disk }}
-{{- .device_name }}
+{{- $disk = .device_name }}
 {{- end }}
 {{- end }}
+{{- $disk }}
 {{- end }}
 
 {{- define "talm.discovered.machinetype" }}

diff --git a/pkg/generated/presets.go b/pkg/generated/presets.go
@@ -215,11 +215,16 @@ version: %s
 description: A library Talm chart for Talos Linux
 `,
 	"talm/templates/_helpers.tpl": `{{- define "talm.discovered.system_disk_name" }}
+{{- $disk := "" }}
 {{- range .Disks }}
+{{- if eq $disk "" }}
+{{- $disk = .device_name }}
+{{- end }}
 {{- if .system_disk }}
-{{- .device_name }}
+{{- $disk = .device_name }}
 {{- end }}
 {{- end }}
+{{- $disk }}
 {{- end }}
 
 {{- define "talm.discovered.machinetype" }}