From 0789be309160f2f00a700f418f0e9418d4a96d36 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Wed, 9 Apr 2025 20:27:08 +0200 Subject: [PATCH] Fix filter to show QEMU disks Signed-off-by: Andrei Kvapil --- charts/talm/templates/_helpers.tpl | 4 ++-- pkg/generated/presets.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/talm/templates/_helpers.tpl b/charts/talm/templates/_helpers.tpl index fedf2ed..ebde6cf 100644 --- a/charts/talm/templates/_helpers.tpl +++ b/charts/talm/templates/_helpers.tpl @@ -5,7 +5,7 @@ {{- else }} {{- $disk := "/dev/sda" }} {{- range (lookup "disks" "" "").items }} -{{- if .spec.wwid }} +{{- if or .spec.wwid .spec.model }} {{- $disk = .spec.dev_path }} {{- break }} {{- end }} @@ -30,7 +30,7 @@ {{- define "talm.discovered.disks_info" }} # -- Discovered disks: {{- range (lookup "disks" "" "").items }} -{{- if .spec.wwid }} +{{- if or .spec.wwid .spec.model }} # {{ .spec.dev_path }}: # model: {{ .spec.model }} # serial: {{ .spec.serial }} diff --git a/pkg/generated/presets.go b/pkg/generated/presets.go index c54df3c..de155b9 100644 --- a/pkg/generated/presets.go +++ b/pkg/generated/presets.go @@ -235,7 +235,7 @@ description: A library Talm chart for Talos Linux {{- else }} {{- $disk := "/dev/sda" }} {{- range (lookup "disks" "" "").items }} -{{- if .spec.wwid }} +{{- if or .spec.wwid .spec.model }} {{- $disk = .spec.dev_path }} {{- break }} {{- end }} @@ -260,7 +260,7 @@ description: A library Talm chart for Talos Linux {{- define "talm.discovered.disks_info" }} # -- Discovered disks: {{- range (lookup "disks" "" "").items }} -{{- if .spec.wwid }} +{{- if or .spec.wwid .spec.model }} # {{ .spec.dev_path }}: # model: {{ .spec.model }} # serial: {{ .spec.serial }}