From e799168b345dd99e48c115727bdd4cf579f903ff Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Thu, 30 May 2024 14:13:16 +0200 Subject: [PATCH] Fix: always specify disk, even if system_disk not found fixes https://github.com/aenix-io/talm/issues/4 Signed-off-by: Andrei Kvapil --- charts/talm/templates/_helpers.tpl | 7 ++++++- pkg/generated/presets.go | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/charts/talm/templates/_helpers.tpl b/charts/talm/templates/_helpers.tpl index c89d093..ca981e9 100644 --- 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 index 7de8187..fa7e0fc 100644 --- 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" }}